区域基础数据更新

setup-project-manager-ui @ 41fb2613

-Subproject commit a84cc56da34785cfdc0685de536b7b133eb02c57
+Subproject commit 41fb26137a8cd899930fd382d6d3947cdf9424ee

setup-project-manager/pom.xml

@@ -27,6 +27,12 @@
         <profiles.filepath>/mortals/app/data</profiles.filepath>
         <profiles.nacosUrl>http://127.0.0.1:8848</profiles.nacosUrl>
         <profiles.server.debug></profiles.server.debug>
+
+        <profiles.redis.uri>127.0.0.1</profiles.redis.uri>
+        <profiles.redis.port>6379</profiles.redis.port>
+        <profiles.redis.username></profiles.redis.username>
+        <profiles.redis.password></profiles.redis.password>
+        <profiles.redis.database>15</profiles.redis.database>
     </properties>
 
     <profiles>
@@ -55,6 +61,11 @@
                 <profiles.datasource.username>root</profiles.datasource.username>
                 <profiles.datasource.password>xhx@2022</profiles.datasource.password>
                 <profiles.publish.path>/home/publish/</profiles.publish.path>
+                <profiles.redis.uri>192.168.0.252</profiles.redis.uri>
+                <profiles.redis.port>6379</profiles.redis.port>
+                <profiles.redis.username></profiles.redis.username>
+                <profiles.redis.password>hotel@2020</profiles.redis.password>
+                <profiles.redis.database>15</profiles.redis.database>
             </properties>
         </profile>
         <profile>

setup-project-manager/src/main/java/com/mortals/xhx/ManagerApplication.java

@@ -14,12 +14,14 @@ import org.springframework.context.annotation.ImportResource;
 @ServletComponentScan("com.mortals")
 @ImportResource(locations = {"classpath:config/spring-config.xml"})
 public class ManagerApplication extends BaseWebApplication {
+/*
 
     @Bean
     public ICacheService cacheService() {
         return new LocalCacheServiceImpl();
     }
 
+*/
 
     public static void main(String[] args) {
         SpringApplication.run(ManagerApplication.class, args);

setup-project-manager/src/main/java/com/mortals/xhx/module/base/dao/BaseAreaDao.java

+package com.mortals.xhx.module.base.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+
+/**
+* 区域Dao
+* 区域 DAO接口
+*
+* @author zxfei
+* @date 2022-11-22
+*/
+
+public interface  BaseAreaDao extends ICRUDDao<BaseAreaEntity,Long>{
+
+
+}

setup-project-manager/src/main/java/com/mortals/xhx/module/base/dao/ibatis/BaseAreaDaoImpl.java

+package com.mortals.xhx.module.base.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.base.dao.BaseAreaDao;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+import org.springframework.stereotype.Repository;
+
+/**
+* 区域DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-11-22
+*/
+@Repository("baseAreaDao")
+public class BaseAreaDaoImpl extends BaseCRUDDaoMybatis<BaseAreaEntity,Long> implements BaseAreaDao {
+
+
+
+}

setup-project-manager/src/main/java/com/mortals/xhx/module/base/model/BaseAreaEntity.java

+package com.mortals.xhx.module.base.model;
+
+import com.mortals.xhx.module.base.model.vo.BaseAreaVo;
+/**
+* 区域实体对象
+*
+* @author zxfei
+* @date 2022-11-22
+*/
+
+public class BaseAreaEntity extends BaseAreaVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 祖级列表，逗号分隔
+    */
+    private String ancestors;
+    /**
+    * 区域名称
+    */
+    private String name;
+    /**
+    * 一体化的ID号
+    */
+    private String iid;
+    /**
+    * 一体化的父id
+    */
+    private String pid;
+    /**
+    * 是否有下级区域（True.是，False.否）
+    */
+    private String haveSonArea;
+    /**
+    * 是否有下级部门（True.是，False.否）
+    */
+    private String haveSonDept;
+    /**
+    * 是否获取部门（true.是，false.否）
+    */
+    private String haveGetDept;
+    /**
+    * 是否获取事项列表（true.是，false.否）
+    */
+    private String haveGetMatterList;
+    /**
+    * 区域编码
+    */
+    private String areaCode;
+    /**
+    * 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    */
+    private Integer areaLevel;
+    /**
+    * 名称简称
+    */
+    private String shortName;
+    /**
+    * 访问地址
+    */
+    private String domain;
+    /**
+    * 区域状态 (0.停用，1.正常)
+    */
+    private Integer status;
+
+
+
+    public BaseAreaEntity(){}
+    /**
+    * 获取 祖级列表，逗号分隔
+    * @return String
+    */
+    public String getAncestors(){
+        return ancestors;
+    }
+    /**
+    * 设置 祖级列表，逗号分隔
+    * @param ancestors
+    */
+    public void setAncestors(String ancestors){
+        this.ancestors = ancestors;
+    }
+    /**
+    * 获取 区域名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 区域名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+    /**
+    * 获取 一体化的ID号
+    * @return String
+    */
+    public String getIid(){
+        return iid;
+    }
+    /**
+    * 设置 一体化的ID号
+    * @param iid
+    */
+    public void setIid(String iid){
+        this.iid = iid;
+    }
+    /**
+    * 获取 一体化的父id
+    * @return String
+    */
+    public String getPid(){
+        return pid;
+    }
+    /**
+    * 设置 一体化的父id
+    * @param pid
+    */
+    public void setPid(String pid){
+        this.pid = pid;
+    }
+    /**
+    * 获取 是否有下级区域（True.是，False.否）
+    * @return String
+    */
+    public String getHaveSonArea(){
+        return haveSonArea;
+    }
+    /**
+    * 设置 是否有下级区域（True.是，False.否）
+    * @param haveSonArea
+    */
+    public void setHaveSonArea(String haveSonArea){
+        this.haveSonArea = haveSonArea;
+    }
+    /**
+    * 获取 是否有下级部门（True.是，False.否）
+    * @return String
+    */
+    public String getHaveSonDept(){
+        return haveSonDept;
+    }
+    /**
+    * 设置 是否有下级部门（True.是，False.否）
+    * @param haveSonDept
+    */
+    public void setHaveSonDept(String haveSonDept){
+        this.haveSonDept = haveSonDept;
+    }
+    /**
+    * 获取 是否获取部门（true.是，false.否）
+    * @return String
+    */
+    public String getHaveGetDept(){
+        return haveGetDept;
+    }
+    /**
+    * 设置 是否获取部门（true.是，false.否）
+    * @param haveGetDept
+    */
+    public void setHaveGetDept(String haveGetDept){
+        this.haveGetDept = haveGetDept;
+    }
+    /**
+    * 获取 是否获取事项列表（true.是，false.否）
+    * @return String
+    */
+    public String getHaveGetMatterList(){
+        return haveGetMatterList;
+    }
+    /**
+    * 设置 是否获取事项列表（true.是，false.否）
+    * @param haveGetMatterList
+    */
+    public void setHaveGetMatterList(String haveGetMatterList){
+        this.haveGetMatterList = haveGetMatterList;
+    }
+    /**
+    * 获取 区域编码
+    * @return String
+    */
+    public String getAreaCode(){
+        return areaCode;
+    }
+    /**
+    * 设置 区域编码
+    * @param areaCode
+    */
+    public void setAreaCode(String areaCode){
+        this.areaCode = areaCode;
+    }
+    /**
+    * 获取 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @return Integer
+    */
+    public Integer getAreaLevel(){
+        return areaLevel;
+    }
+    /**
+    * 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevel
+    */
+    public void setAreaLevel(Integer areaLevel){
+        this.areaLevel = areaLevel;
+    }
+    /**
+    * 获取 名称简称
+    * @return String
+    */
+    public String getShortName(){
+        return shortName;
+    }
+    /**
+    * 设置 名称简称
+    * @param shortName
+    */
+    public void setShortName(String shortName){
+        this.shortName = shortName;
+    }
+    /**
+    * 获取 访问地址
+    * @return String
+    */
+    public String getDomain(){
+        return domain;
+    }
+    /**
+    * 设置 访问地址
+    * @param domain
+    */
+    public void setDomain(String domain){
+        this.domain = domain;
+    }
+    /**
+    * 获取 区域状态 (0.停用，1.正常)
+    * @return Integer
+    */
+    public Integer getStatus(){
+        return status;
+    }
+    /**
+    * 设置 区域状态 (0.停用，1.正常)
+    * @param status
+    */
+    public void setStatus(Integer status){
+        this.status = status;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof BaseAreaEntity) {
+            BaseAreaEntity tmp = (BaseAreaEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",ancestors:").append(getAncestors());
+        sb.append(",name:").append(getName());
+        sb.append(",iid:").append(getIid());
+        sb.append(",pid:").append(getPid());
+        sb.append(",haveSonArea:").append(getHaveSonArea());
+        sb.append(",haveSonDept:").append(getHaveSonDept());
+        sb.append(",haveGetDept:").append(getHaveGetDept());
+        sb.append(",haveGetMatterList:").append(getHaveGetMatterList());
+        sb.append(",areaCode:").append(getAreaCode());
+        sb.append(",areaLevel:").append(getAreaLevel());
+        sb.append(",shortName:").append(getShortName());
+        sb.append(",domain:").append(getDomain());
+        sb.append(",status:").append(getStatus());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.ancestors = "";
+
+            this.name = null;
+
+            this.iid = null;
+
+            this.pid = null;
+
+            this.haveSonArea = null;
+
+            this.haveSonDept = null;
+
+            this.haveGetDept = null;
+
+            this.haveGetMatterList = null;
+
+            this.areaCode = null;
+
+            this.areaLevel = 1;
+
+            this.shortName = null;
+
+            this.domain = null;
+
+            this.status = 1;
+    }
+}
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/base/model/BaseAreaQuery.java

+package com.mortals.xhx.module.base.model;
+
+import java.util.List;
+
+/**
+* 区域查询对象
+*
+* @author zxfei
+* @date 2022-11-22
+*/
+public class BaseAreaQuery extends BaseAreaEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 祖级列表，逗号分隔 */
+    private List<String> ancestorsList;
+
+    /** 区域名称 */
+    private List<String> nameList;
+
+    /** 一体化的ID号 */
+    private List<String> iidList;
+
+    /** 一体化的父id */
+    private List<String> pidList;
+
+    /** 是否有下级区域（True.是，False.否） */
+    private List<String> haveSonAreaList;
+
+    /** 是否有下级部门（True.是，False.否） */
+    private List<String> haveSonDeptList;
+
+    /** 是否获取部门（true.是，false.否） */
+    private List<String> haveGetDeptList;
+
+    /** 是否获取事项列表（true.是，false.否） */
+    private List<String> haveGetMatterListList;
+
+    /** 区域编码 */
+    private List<String> areaCodeList;
+
+    /** 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
+    private Integer areaLevelStart;
+
+    /** 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
+    private Integer areaLevelEnd;
+
+    /** 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
+    private Integer areaLevelIncrement;
+
+    /** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)列表 */
+    private List <Integer> areaLevelList;
+
+    /** 名称简称 */
+    private List<String> shortNameList;
+
+    /** 访问地址 */
+    private List<String> domainList;
+
+    /** 开始 区域状态 (0.停用，1.正常) */
+    private Integer statusStart;
+
+    /** 结束 区域状态 (0.停用，1.正常) */
+    private Integer statusEnd;
+
+    /** 增加 区域状态 (0.停用，1.正常) */
+    private Integer statusIncrement;
+
+    /** 区域状态 (0.停用，1.正常)列表 */
+    private List <Integer> statusList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<BaseAreaQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<BaseAreaQuery> andConditionList;
+
+    public BaseAreaQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 祖级列表，逗号分隔
+    * @return ancestorsList
+    */
+    public List<String> getAncestorsList(){
+        return this.ancestorsList;
+    }
+
+    /**
+    * 设置 祖级列表，逗号分隔
+    * @param ancestorsList
+    */
+    public void setAncestorsList(List<String> ancestorsList){
+        this.ancestorsList = ancestorsList;
+    }
+    /**
+    * 获取 区域名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 区域名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 一体化的ID号
+    * @return iidList
+    */
+    public List<String> getIidList(){
+        return this.iidList;
+    }
+
+    /**
+    * 设置 一体化的ID号
+    * @param iidList
+    */
+    public void setIidList(List<String> iidList){
+        this.iidList = iidList;
+    }
+    /**
+    * 获取 一体化的父id
+    * @return pidList
+    */
+    public List<String> getPidList(){
+        return this.pidList;
+    }
+
+    /**
+    * 设置 一体化的父id
+    * @param pidList
+    */
+    public void setPidList(List<String> pidList){
+        this.pidList = pidList;
+    }
+    /**
+    * 获取 是否有下级区域（True.是，False.否）
+    * @return haveSonAreaList
+    */
+    public List<String> getHaveSonAreaList(){
+        return this.haveSonAreaList;
+    }
+
+    /**
+    * 设置 是否有下级区域（True.是，False.否）
+    * @param haveSonAreaList
+    */
+    public void setHaveSonAreaList(List<String> haveSonAreaList){
+        this.haveSonAreaList = haveSonAreaList;
+    }
+    /**
+    * 获取 是否有下级部门（True.是，False.否）
+    * @return haveSonDeptList
+    */
+    public List<String> getHaveSonDeptList(){
+        return this.haveSonDeptList;
+    }
+
+    /**
+    * 设置 是否有下级部门（True.是，False.否）
+    * @param haveSonDeptList
+    */
+    public void setHaveSonDeptList(List<String> haveSonDeptList){
+        this.haveSonDeptList = haveSonDeptList;
+    }
+    /**
+    * 获取 是否获取部门（true.是，false.否）
+    * @return haveGetDeptList
+    */
+    public List<String> getHaveGetDeptList(){
+        return this.haveGetDeptList;
+    }
+
+    /**
+    * 设置 是否获取部门（true.是，false.否）
+    * @param haveGetDeptList
+    */
+    public void setHaveGetDeptList(List<String> haveGetDeptList){
+        this.haveGetDeptList = haveGetDeptList;
+    }
+    /**
+    * 获取 是否获取事项列表（true.是，false.否）
+    * @return haveGetMatterListList
+    */
+    public List<String> getHaveGetMatterListList(){
+        return this.haveGetMatterListList;
+    }
+
+    /**
+    * 设置 是否获取事项列表（true.是，false.否）
+    * @param haveGetMatterListList
+    */
+    public void setHaveGetMatterListList(List<String> haveGetMatterListList){
+        this.haveGetMatterListList = haveGetMatterListList;
+    }
+    /**
+    * 获取 区域编码
+    * @return areaCodeList
+    */
+    public List<String> getAreaCodeList(){
+        return this.areaCodeList;
+    }
+
+    /**
+    * 设置 区域编码
+    * @param areaCodeList
+    */
+    public void setAreaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+    }
+    /**
+    * 获取 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @return areaLevelStart
+    */
+    public Integer getAreaLevelStart(){
+        return this.areaLevelStart;
+    }
+
+    /**
+    * 设置 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelStart
+    */
+    public void setAreaLevelStart(Integer areaLevelStart){
+        this.areaLevelStart = areaLevelStart;
+    }
+
+    /**
+    * 获取 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @return $areaLevelEnd
+    */
+    public Integer getAreaLevelEnd(){
+        return this.areaLevelEnd;
+    }
+
+    /**
+    * 设置 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelEnd
+    */
+    public void setAreaLevelEnd(Integer areaLevelEnd){
+        this.areaLevelEnd = areaLevelEnd;
+    }
+
+    /**
+    * 获取 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @return areaLevelIncrement
+    */
+    public Integer getAreaLevelIncrement(){
+        return this.areaLevelIncrement;
+    }
+
+    /**
+    * 设置 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelIncrement
+    */
+    public void setAreaLevelIncrement(Integer areaLevelIncrement){
+        this.areaLevelIncrement = areaLevelIncrement;
+    }
+
+    /**
+    * 获取 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @return areaLevelList
+    */
+    public List<Integer> getAreaLevelList(){
+        return this.areaLevelList;
+    }
+
+    /**
+    * 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelList
+    */
+    public void setAreaLevelList(List<Integer> areaLevelList){
+        this.areaLevelList = areaLevelList;
+    }
+
+    /**
+    * 获取 名称简称
+    * @return shortNameList
+    */
+    public List<String> getShortNameList(){
+        return this.shortNameList;
+    }
+
+    /**
+    * 设置 名称简称
+    * @param shortNameList
+    */
+    public void setShortNameList(List<String> shortNameList){
+        this.shortNameList = shortNameList;
+    }
+    /**
+    * 获取 访问地址
+    * @return domainList
+    */
+    public List<String> getDomainList(){
+        return this.domainList;
+    }
+
+    /**
+    * 设置 访问地址
+    * @param domainList
+    */
+    public void setDomainList(List<String> domainList){
+        this.domainList = domainList;
+    }
+    /**
+    * 获取 开始 区域状态 (0.停用，1.正常)
+    * @return statusStart
+    */
+    public Integer getStatusStart(){
+        return this.statusStart;
+    }
+
+    /**
+    * 设置 开始 区域状态 (0.停用，1.正常)
+    * @param statusStart
+    */
+    public void setStatusStart(Integer statusStart){
+        this.statusStart = statusStart;
+    }
+
+    /**
+    * 获取 结束 区域状态 (0.停用，1.正常)
+    * @return $statusEnd
+    */
+    public Integer getStatusEnd(){
+        return this.statusEnd;
+    }
+
+    /**
+    * 设置 结束 区域状态 (0.停用，1.正常)
+    * @param statusEnd
+    */
+    public void setStatusEnd(Integer statusEnd){
+        this.statusEnd = statusEnd;
+    }
+
+    /**
+    * 获取 增加 区域状态 (0.停用，1.正常)
+    * @return statusIncrement
+    */
+    public Integer getStatusIncrement(){
+        return this.statusIncrement;
+    }
+
+    /**
+    * 设置 增加 区域状态 (0.停用，1.正常)
+    * @param statusIncrement
+    */
+    public void setStatusIncrement(Integer statusIncrement){
+        this.statusIncrement = statusIncrement;
+    }
+
+    /**
+    * 获取 区域状态 (0.停用，1.正常)
+    * @return statusList
+    */
+    public List<Integer> getStatusList(){
+        return this.statusList;
+    }
+
+    /**
+    * 设置 区域状态 (0.停用，1.正常)
+    * @param statusList
+    */
+    public void setStatusList(List<Integer> statusList){
+        this.statusList = statusList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public BaseAreaQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public BaseAreaQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public BaseAreaQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public BaseAreaQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public BaseAreaQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 祖级列表，逗号分隔
+    * @param ancestors
+    */
+    public BaseAreaQuery ancestors(String ancestors){
+        setAncestors(ancestors);
+		return this;
+    }
+
+    /**
+    * 设置 祖级列表，逗号分隔
+    * @param ancestorsList
+    */
+    public BaseAreaQuery ancestorsList(List<String> ancestorsList){
+        this.ancestorsList = ancestorsList;
+		return this;
+    }
+
+
+	/**
+    * 设置 区域名称
+    * @param name
+    */
+    public BaseAreaQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 区域名称
+    * @param nameList
+    */
+    public BaseAreaQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 一体化的ID号
+    * @param iid
+    */
+    public BaseAreaQuery iid(String iid){
+        setIid(iid);
+		return this;
+    }
+
+    /**
+    * 设置 一体化的ID号
+    * @param iidList
+    */
+    public BaseAreaQuery iidList(List<String> iidList){
+        this.iidList = iidList;
+		return this;
+    }
+
+
+	/**
+    * 设置 一体化的父id
+    * @param pid
+    */
+    public BaseAreaQuery pid(String pid){
+        setPid(pid);
+		return this;
+    }
+
+    /**
+    * 设置 一体化的父id
+    * @param pidList
+    */
+    public BaseAreaQuery pidList(List<String> pidList){
+        this.pidList = pidList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否有下级区域（True.是，False.否）
+    * @param haveSonArea
+    */
+    public BaseAreaQuery haveSonArea(String haveSonArea){
+        setHaveSonArea(haveSonArea);
+		return this;
+    }
+
+    /**
+    * 设置 是否有下级区域（True.是，False.否）
+    * @param haveSonAreaList
+    */
+    public BaseAreaQuery haveSonAreaList(List<String> haveSonAreaList){
+        this.haveSonAreaList = haveSonAreaList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否有下级部门（True.是，False.否）
+    * @param haveSonDept
+    */
+    public BaseAreaQuery haveSonDept(String haveSonDept){
+        setHaveSonDept(haveSonDept);
+		return this;
+    }
+
+    /**
+    * 设置 是否有下级部门（True.是，False.否）
+    * @param haveSonDeptList
+    */
+    public BaseAreaQuery haveSonDeptList(List<String> haveSonDeptList){
+        this.haveSonDeptList = haveSonDeptList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否获取部门（true.是，false.否）
+    * @param haveGetDept
+    */
+    public BaseAreaQuery haveGetDept(String haveGetDept){
+        setHaveGetDept(haveGetDept);
+		return this;
+    }
+
+    /**
+    * 设置 是否获取部门（true.是，false.否）
+    * @param haveGetDeptList
+    */
+    public BaseAreaQuery haveGetDeptList(List<String> haveGetDeptList){
+        this.haveGetDeptList = haveGetDeptList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否获取事项列表（true.是，false.否）
+    * @param haveGetMatterList
+    */
+    public BaseAreaQuery haveGetMatterList(String haveGetMatterList){
+        setHaveGetMatterList(haveGetMatterList);
+		return this;
+    }
+
+    /**
+    * 设置 是否获取事项列表（true.是，false.否）
+    * @param haveGetMatterListList
+    */
+    public BaseAreaQuery haveGetMatterListList(List<String> haveGetMatterListList){
+        this.haveGetMatterListList = haveGetMatterListList;
+		return this;
+    }
+
+
+	/**
+    * 设置 区域编码
+    * @param areaCode
+    */
+    public BaseAreaQuery areaCode(String areaCode){
+        setAreaCode(areaCode);
+		return this;
+    }
+
+    /**
+    * 设置 区域编码
+    * @param areaCodeList
+    */
+    public BaseAreaQuery areaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+		return this;
+    }
+
+    /**
+    * 设置  区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevel
+    */
+    public BaseAreaQuery areaLevel(Integer areaLevel){
+	    setAreaLevel(areaLevel);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelStart
+    */
+    public BaseAreaQuery areaLevelStart(Integer areaLevelStart){
+		this.areaLevelStart = areaLevelStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelEnd
+    */
+    public BaseAreaQuery areaLevelEnd(Integer areaLevelEnd){
+		this.areaLevelEnd = areaLevelEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelIncrement
+    */
+    public BaseAreaQuery areaLevelIncrement(Integer areaLevelIncrement){
+		this.areaLevelIncrement = areaLevelIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+    * @param areaLevelList
+    */
+    public BaseAreaQuery areaLevelList(List<Integer> areaLevelList){
+        this.areaLevelList = areaLevelList;
+		return this;
+        }
+
+
+	/**
+    * 设置 名称简称
+    * @param shortName
+    */
+    public BaseAreaQuery shortName(String shortName){
+        setShortName(shortName);
+		return this;
+    }
+
+    /**
+    * 设置 名称简称
+    * @param shortNameList
+    */
+    public BaseAreaQuery shortNameList(List<String> shortNameList){
+        this.shortNameList = shortNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 访问地址
+    * @param domain
+    */
+    public BaseAreaQuery domain(String domain){
+        setDomain(domain);
+		return this;
+    }
+
+    /**
+    * 设置 访问地址
+    * @param domainList
+    */
+    public BaseAreaQuery domainList(List<String> domainList){
+        this.domainList = domainList;
+		return this;
+    }
+
+    /**
+    * 设置  区域状态 (0.停用，1.正常)
+    * @param status
+    */
+    public BaseAreaQuery status(Integer status){
+	    setStatus(status);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 区域状态 (0.停用，1.正常)
+    * @param statusStart
+    */
+    public BaseAreaQuery statusStart(Integer statusStart){
+		this.statusStart = statusStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 区域状态 (0.停用，1.正常)
+    * @param statusEnd
+    */
+    public BaseAreaQuery statusEnd(Integer statusEnd){
+		this.statusEnd = statusEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 区域状态 (0.停用，1.正常)
+    * @param statusIncrement
+    */
+    public BaseAreaQuery statusIncrement(Integer statusIncrement){
+		this.statusIncrement = statusIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 区域状态 (0.停用，1.正常)
+    * @param statusList
+    */
+    public BaseAreaQuery statusList(List<Integer> statusList){
+        this.statusList = statusList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public BaseAreaQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public BaseAreaQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public BaseAreaQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public BaseAreaQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public BaseAreaQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<BaseAreaQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<BaseAreaQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<BaseAreaQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<BaseAreaQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/base/model/vo/BaseAreaVo.java

+package com.mortals.xhx.module.base.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 区域视图对象
+ *
+ * @author zxfei
+ * @date 2022-11-22
+ */
+@Data
+public class BaseAreaVo extends BaseEntityLong {
+    private List<BaseAreaEntity> children = new ArrayList<>();
+
+}
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/base/service/BaseAreaService.java

+package com.mortals.xhx.module.base.service;
+
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+
+/**
+ * BaseAreaService
+ * <p>
+ * 区域 service接口
+ *
+ * @author zxfei
+ * @date 2022-11-22
+ */
+public interface BaseAreaService extends ICRUDService<BaseAreaEntity, Long> {
+
+
+}
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java

+package com.mortals.xhx.module.base.service.impl;
+
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.base.dao.BaseAreaDao;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+import com.mortals.xhx.module.base.service.BaseAreaService;
+import org.springframework.stereotype.Service;
+
+/**
+ * BaseAreaService
+ * 区域 service实现
+ *
+ * @author zxfei
+ * @date 2022-11-22
+ */
+@Service("baseAreaService")
+public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, BaseAreaEntity, Long> implements BaseAreaService {
+
+
+}
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/base/web/BaseAreaController.java

+package com.mortals.xhx.module.base.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
+import com.mortals.xhx.module.base.service.BaseAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 区域
+ *
+ * @author zxfei
+ * @date 2022-11-22
+ */
+@RestController
+@RequestMapping("base/area")
+public class BaseAreaController extends BaseCRUDJsonBodyMappingController<BaseAreaService, BaseAreaEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+    @Autowired
+    private ICacheService cacheService;
+
+    public BaseAreaController() {
+        super.setModuleDesc("区域");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "haveSonArea", paramService.getParamBySecondOrganize("BaseArea", "haveSonArea"));
+        this.addDict(model, "haveSonDept", paramService.getParamBySecondOrganize("BaseArea", "haveSonDept"));
+        this.addDict(model, "haveGetDept", paramService.getParamBySecondOrganize("BaseArea", "haveGetDept"));
+        this.addDict(model, "haveGetMatterList", paramService.getParamBySecondOrganize("BaseArea", "haveGetMatterList"));
+        this.addDict(model, "areaLevel", paramService.getParamBySecondOrganize("BaseArea", "areaLevel"));
+        this.addDict(model, "status", paramService.getParamBySecondOrganize("BaseArea", "status"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/model/SetupProjectEntity.java

@@ -79,6 +79,26 @@ public class SetupProjectEntity extends SetupProjectVo {
      * 排序字段
      */
     private Long orderNum;
+    /**
+     * 站点Id
+     */
+    private Long siteId;
+    /**
+     * 站点编号，来源基础服务平台
+     */
+    private String siteCode;
+    /**
+     * 站点名称
+     */
+    private String siteName;
+    /**
+     * 区域编码
+     */
+    private String areaCode;
+    /**
+     * 区域名称
+     */
+    private String areaName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -111,5 +131,10 @@ public class SetupProjectEntity extends SetupProjectVo {
         this.projectStatus = 1;
         this.remark = "";
         this.orderNum = 0L;
+        this.siteId = null;
+        this.siteCode = "";
+        this.siteName = "";
+        this.areaCode = "";
+        this.areaName = "";
     }
 }
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/model/SetupProjectQuery.java

@@ -181,6 +181,41 @@ public class SetupProjectQuery extends SetupProjectEntity {
     /** 创建用户id排除列表 */
     private List <Long> createUserIdNotList;
 
+    /** 开始 站点Id */
+    private Long siteIdStart;
+
+    /** 结束 站点Id */
+    private Long siteIdEnd;
+
+    /** 增加 站点Id */
+    private Long siteIdIncrement;
+
+    /** 站点Id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点Id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 站点编号，来源基础服务平台 */
+    private List<String> siteCodeList;
+
+    /** 站点编号，来源基础服务平台排除列表 */
+    private List <String> siteCodeNotList;
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 区域编码 */
+    private List<String> areaCodeList;
+
+    /** 区域编码排除列表 */
+    private List <String> areaCodeNotList;
+    /** 区域名称 */
+    private List<String> areaNameList;
+
+    /** 区域名称排除列表 */
+    private List <String> areaNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SetupProjectQuery> orConditionList;
 
@@ -1187,6 +1222,215 @@ public class SetupProjectQuery extends SetupProjectEntity {
     }
 
 
+    /**
+     * 获取 开始 站点Id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点Id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点Id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点Id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点Id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 获取 站点编号，来源基础服务平台
+     * @return siteCodeList
+     */
+    public List<String> getSiteCodeList(){
+        return this.siteCodeList;
+    }
+
+    /**
+     * 设置 站点编号，来源基础服务平台
+     * @param siteCodeList
+     */
+    public void setSiteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+    }
+
+    /**
+     * 获取 站点编号，来源基础服务平台
+     * @return siteCodeNotList
+     */
+    public List<String> getSiteCodeNotList(){
+        return this.siteCodeNotList;
+    }
+
+    /**
+     * 设置 站点编号，来源基础服务平台
+     * @param siteCodeNotList
+     */
+    public void setSiteCodeNotList(List<String> siteCodeNotList){
+        this.siteCodeNotList = siteCodeNotList;
+    }
+
+    /**
+     * 获取 站点名称
+     * @return siteNameList
+     */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameList
+     */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+
+    /**
+     * 获取 站点名称
+     * @return siteNameNotList
+     */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameNotList
+     */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
+    /**
+     * 获取 区域编码
+     * @return areaCodeList
+     */
+    public List<String> getAreaCodeList(){
+        return this.areaCodeList;
+    }
+
+    /**
+     * 设置 区域编码
+     * @param areaCodeList
+     */
+    public void setAreaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+    }
+
+    /**
+     * 获取 区域编码
+     * @return areaCodeNotList
+     */
+    public List<String> getAreaCodeNotList(){
+        return this.areaCodeNotList;
+    }
+
+    /**
+     * 设置 区域编码
+     * @param areaCodeNotList
+     */
+    public void setAreaCodeNotList(List<String> areaCodeNotList){
+        this.areaCodeNotList = areaCodeNotList;
+    }
+
+    /**
+     * 获取 区域名称
+     * @return areaNameList
+     */
+    public List<String> getAreaNameList(){
+        return this.areaNameList;
+    }
+
+    /**
+     * 设置 区域名称
+     * @param areaNameList
+     */
+    public void setAreaNameList(List<String> areaNameList){
+        this.areaNameList = areaNameList;
+    }
+
+    /**
+     * 获取 区域名称
+     * @return areaNameNotList
+     */
+    public List<String> getAreaNameNotList(){
+        return this.areaNameNotList;
+    }
+
+    /**
+     * 设置 区域名称
+     * @param areaNameNotList
+     */
+    public void setAreaNameNotList(List<String> areaNameNotList){
+        this.areaNameNotList = areaNameNotList;
+    }
+
     /**
      * 设置  ID,主键，自增长
      * @param id
@@ -1779,6 +2023,136 @@ public class SetupProjectQuery extends SetupProjectEntity {
         return this;
     }
 
+    /**
+     * 设置  站点Id
+     * @param siteId
+     */
+    public SetupProjectQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
+    public SetupProjectQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
+    public SetupProjectQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
+    public SetupProjectQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdList
+     */
+    public SetupProjectQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public SetupProjectQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 站点编号，来源基础服务平台
+     * @param siteCode
+     */
+    public SetupProjectQuery siteCode(String siteCode){
+        setSiteCode(siteCode);
+        return this;
+    }
+
+    /**
+     * 设置 站点编号，来源基础服务平台
+     * @param siteCodeList
+     */
+    public SetupProjectQuery siteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+        return this;
+    }
+
+
+    /**
+     * 设置 站点名称
+     * @param siteName
+     */
+    public SetupProjectQuery siteName(String siteName){
+        setSiteName(siteName);
+        return this;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameList
+     */
+    public SetupProjectQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 区域编码
+     * @param areaCode
+     */
+    public SetupProjectQuery areaCode(String areaCode){
+        setAreaCode(areaCode);
+        return this;
+    }
+
+    /**
+     * 设置 区域编码
+     * @param areaCodeList
+     */
+    public SetupProjectQuery areaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+        return this;
+    }
+
+
+    /**
+     * 设置 区域名称
+     * @param areaName
+     */
+    public SetupProjectQuery areaName(String areaName){
+        setAreaName(areaName);
+        return this;
+    }
+
+    /**
+     * 设置 区域名称
+     * @param areaNameList
+     */
+    public SetupProjectQuery areaNameList(List<String> areaNameList){
+        this.areaNameList = areaNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

setup-project-manager/src/main/resources/bootstrap.yml

@@ -11,6 +11,12 @@ spring:
     multipart:
       max-file-size: 1000MB
       max-request-size: 1000MB
+#  redis:
+#    host: @profiles.redis.uri@
+#    port: @profiles.redis.port@
+#    username: @profiles.redis.username@
+#    password: @profiles.redis.password@
+#    database:  @profiles.redis.database@
   jackson:
     serialization:
       WRITE_DATES_AS_TIMESTAMPS: true

setup-project-manager/src/main/resources/sqlmap/module/base/BaseAreaMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.base.dao.ibatis.BaseAreaDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="BaseAreaEntity" id="BaseAreaEntity-Map">
+            <id  property="id" column="id" />
+            <result property="ancestors" column="ancestors" />
+            <result property="name" column="name" />
+            <result property="iid" column="iid" />
+            <result property="pid" column="pid" />
+            <result property="haveSonArea" column="haveSonArea" />
+            <result property="haveSonDept" column="haveSonDept" />
+            <result property="haveGetDept" column="haveGetDept" />
+            <result property="haveGetMatterList" column="haveGetMatterList" />
+            <result property="areaCode" column="areaCode" />
+            <result property="areaLevel" column="areaLevel" />
+            <result property="shortName" column="shortName" />
+            <result property="domain" column="domain" />
+            <result property="status" column="status" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
+                    a.ancestors,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('iid') or colPickMode == 1 and data.containsKey('iid')))">
+                    a.iid,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pid') or colPickMode == 1 and data.containsKey('pid')))">
+                    a.pid,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveSonArea') or colPickMode == 1 and data.containsKey('haveSonArea')))">
+                    a.haveSonArea,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveSonDept') or colPickMode == 1 and data.containsKey('haveSonDept')))">
+                    a.haveSonDept,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveGetDept') or colPickMode == 1 and data.containsKey('haveGetDept')))">
+                    a.haveGetDept,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveGetMatterList') or colPickMode == 1 and data.containsKey('haveGetMatterList')))">
+                    a.haveGetMatterList,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
+                    a.areaCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaLevel') or colPickMode == 1 and data.containsKey('areaLevel')))">
+                    a.areaLevel,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shortName') or colPickMode == 1 and data.containsKey('shortName')))">
+                    a.shortName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('domain') or colPickMode == 1 and data.containsKey('domain')))">
+                    a.domain,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
+                    a.status,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="BaseAreaEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_base_area
+        (ancestors,name,iid,pid,haveSonArea,haveSonDept,haveGetDept,haveGetMatterList,areaCode,areaLevel,shortName,domain,status,createTime,createUserId,updateTime)
+        VALUES
+        (#{ancestors},#{name},#{iid},#{pid},#{haveSonArea},#{haveSonDept},#{haveGetDept},#{haveGetMatterList},#{areaCode},#{areaLevel},#{shortName},#{domain},#{status},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_base_area
+        (ancestors,name,iid,pid,haveSonArea,haveSonDept,haveGetDept,haveGetMatterList,areaCode,areaLevel,shortName,domain,status,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.ancestors},#{item.name},#{item.iid},#{item.pid},#{item.haveSonArea},#{item.haveSonDept},#{item.haveGetDept},#{item.haveGetMatterList},#{item.areaCode},#{item.areaLevel},#{item.shortName},#{item.domain},#{item.status},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_base_area as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
+                a.ancestors=#{data.ancestors},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('iid')) or (colPickMode==1 and !data.containsKey('iid'))">
+                a.iid=#{data.iid},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pid')) or (colPickMode==1 and !data.containsKey('pid'))">
+                a.pid=#{data.pid},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveSonArea')) or (colPickMode==1 and !data.containsKey('haveSonArea'))">
+                a.haveSonArea=#{data.haveSonArea},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveSonDept')) or (colPickMode==1 and !data.containsKey('haveSonDept'))">
+                a.haveSonDept=#{data.haveSonDept},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveGetDept')) or (colPickMode==1 and !data.containsKey('haveGetDept'))">
+                a.haveGetDept=#{data.haveGetDept},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveGetMatterList')) or (colPickMode==1 and !data.containsKey('haveGetMatterList'))">
+                a.haveGetMatterList=#{data.haveGetMatterList},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
+                a.areaCode=#{data.areaCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('areaLevel')) or (colPickMode==1 and !data.containsKey('areaLevel'))">
+                a.areaLevel=#{data.areaLevel},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('areaLevelIncrement')) or (colPickMode==1 and !data.containsKey('areaLevelIncrement'))">
+                a.areaLevel=ifnull(a.areaLevel,0) + #{data.areaLevelIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
+                a.shortName=#{data.shortName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('domain')) or (colPickMode==1 and !data.containsKey('domain'))">
+                a.domain=#{data.domain},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
+                a.status=#{data.status},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
+                a.status=ifnull(a.status,0) + #{data.statusIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_base_area as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="ancestors=(case" suffix="ELSE ancestors end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
+                            when a.id=#{item.id} then #{item.ancestors}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="iid=(case" suffix="ELSE iid end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('iid')) or (colPickMode==1 and !item.containsKey('iid'))">
+                            when a.id=#{item.id} then #{item.iid}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pid=(case" suffix="ELSE pid end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pid')) or (colPickMode==1 and !item.containsKey('pid'))">
+                            when a.id=#{item.id} then #{item.pid}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveSonArea=(case" suffix="ELSE haveSonArea end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveSonArea')) or (colPickMode==1 and !item.containsKey('haveSonArea'))">
+                            when a.id=#{item.id} then #{item.haveSonArea}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveSonDept=(case" suffix="ELSE haveSonDept end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveSonDept')) or (colPickMode==1 and !item.containsKey('haveSonDept'))">
+                            when a.id=#{item.id} then #{item.haveSonDept}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveGetDept=(case" suffix="ELSE haveGetDept end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveGetDept')) or (colPickMode==1 and !item.containsKey('haveGetDept'))">
+                            when a.id=#{item.id} then #{item.haveGetDept}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveGetMatterList=(case" suffix="ELSE haveGetMatterList end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveGetMatterList')) or (colPickMode==1 and !item.containsKey('haveGetMatterList'))">
+                            when a.id=#{item.id} then #{item.haveGetMatterList}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
+                            when a.id=#{item.id} then #{item.areaCode}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="areaLevel=(case" suffix="ELSE areaLevel end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('areaLevel')) or (colPickMode==1 and !item.containsKey('areaLevel'))">
+                                        when a.id=#{item.id} then #{item.areaLevel}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('areaLevelIncrement')) or (colPickMode==1 and !item.containsKey('areaLevelIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.areaLevel,0) + #{item.areaLevelIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="shortName=(case" suffix="ELSE shortName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('shortName')) or (colPickMode==1 and !item.containsKey('shortName'))">
+                            when a.id=#{item.id} then #{item.shortName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="domain=(case" suffix="ELSE domain end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('domain')) or (colPickMode==1 and !item.containsKey('domain'))">
+                            when a.id=#{item.id} then #{item.domain}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="status=(case" suffix="ELSE status end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
+                                        when a.id=#{item.id} then #{item.status}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="BaseAreaEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_base_area as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_base_area as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_base_area where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_base_area where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_base_area where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_base_area as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="BaseAreaEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_base_area as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_base_area as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('ancestors')">
+                <if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
+                    ${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
+                </if>
+                <if test="conditionParamRef.ancestors == null">
+                    ${_conditionType_} a.ancestors is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('ancestorsList')">
+                ${_conditionType_} a.ancestors in
+                <foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('iid')">
+                <if test="conditionParamRef.iid != null and conditionParamRef.iid != ''">
+                    ${_conditionType_} a.iid like #{${_conditionParam_}.iid}
+                </if>
+                <if test="conditionParamRef.iid == null">
+                    ${_conditionType_} a.iid is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('iidList')">
+                ${_conditionType_} a.iid in
+                <foreach collection="conditionParamRef.iidList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pid')">
+                <if test="conditionParamRef.pid != null and conditionParamRef.pid != ''">
+                    ${_conditionType_} a.pid like #{${_conditionParam_}.pid}
+                </if>
+                <if test="conditionParamRef.pid == null">
+                    ${_conditionType_} a.pid is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pidList')">
+                ${_conditionType_} a.pid in
+                <foreach collection="conditionParamRef.pidList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveSonArea')">
+                <if test="conditionParamRef.haveSonArea != null and conditionParamRef.haveSonArea != ''">
+                    ${_conditionType_} a.haveSonArea like #{${_conditionParam_}.haveSonArea}
+                </if>
+                <if test="conditionParamRef.haveSonArea == null">
+                    ${_conditionType_} a.haveSonArea is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveSonAreaList')">
+                ${_conditionType_} a.haveSonArea in
+                <foreach collection="conditionParamRef.haveSonAreaList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveSonDept')">
+                <if test="conditionParamRef.haveSonDept != null and conditionParamRef.haveSonDept != ''">
+                    ${_conditionType_} a.haveSonDept like #{${_conditionParam_}.haveSonDept}
+                </if>
+                <if test="conditionParamRef.haveSonDept == null">
+                    ${_conditionType_} a.haveSonDept is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveSonDeptList')">
+                ${_conditionType_} a.haveSonDept in
+                <foreach collection="conditionParamRef.haveSonDeptList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveGetDept')">
+                <if test="conditionParamRef.haveGetDept != null and conditionParamRef.haveGetDept != ''">
+                    ${_conditionType_} a.haveGetDept like #{${_conditionParam_}.haveGetDept}
+                </if>
+                <if test="conditionParamRef.haveGetDept == null">
+                    ${_conditionType_} a.haveGetDept is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveGetDeptList')">
+                ${_conditionType_} a.haveGetDept in
+                <foreach collection="conditionParamRef.haveGetDeptList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveGetMatterList')">
+                <if test="conditionParamRef.haveGetMatterList != null and conditionParamRef.haveGetMatterList != ''">
+                    ${_conditionType_} a.haveGetMatterList like #{${_conditionParam_}.haveGetMatterList}
+                </if>
+                <if test="conditionParamRef.haveGetMatterList == null">
+                    ${_conditionType_} a.haveGetMatterList is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveGetMatterListList')">
+                ${_conditionType_} a.haveGetMatterList in
+                <foreach collection="conditionParamRef.haveGetMatterListList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('areaCode')">
+                <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
+                    ${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
+                </if>
+                <if test="conditionParamRef.areaCode == null">
+                    ${_conditionType_} a.areaCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('areaCodeList')">
+                ${_conditionType_} a.areaCode in
+                <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevel')">
+                <if test="conditionParamRef.areaLevel != null ">
+                    ${_conditionType_} a.areaLevel = #{${_conditionParam_}.areaLevel}
+                </if>
+                <if test="conditionParamRef.areaLevel == null">
+                    ${_conditionType_} a.areaLevel is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevelList')">
+                ${_conditionType_} a.areaLevel in
+                <foreach collection="conditionParamRef.areaLevelList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevelStart') and conditionParamRef.areaLevelStart != null">
+                ${_conditionType_} a.areaLevel <![CDATA[ >= ]]> #{${_conditionParam_}.areaLevelStart}
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevelEnd') and conditionParamRef.areaLevelEnd != null">
+                ${_conditionType_} a.areaLevel <![CDATA[ <= ]]> #{${_conditionParam_}.areaLevelEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('shortName')">
+                <if test="conditionParamRef.shortName != null and conditionParamRef.shortName != ''">
+                    ${_conditionType_} a.shortName like #{${_conditionParam_}.shortName}
+                </if>
+                <if test="conditionParamRef.shortName == null">
+                    ${_conditionType_} a.shortName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('shortNameList')">
+                ${_conditionType_} a.shortName in
+                <foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('domain')">
+                <if test="conditionParamRef.domain != null and conditionParamRef.domain != ''">
+                    ${_conditionType_} a.domain like #{${_conditionParam_}.domain}
+                </if>
+                <if test="conditionParamRef.domain == null">
+                    ${_conditionType_} a.domain is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('domainList')">
+                ${_conditionType_} a.domain in
+                <foreach collection="conditionParamRef.domainList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('status')">
+                <if test="conditionParamRef.status != null ">
+                    ${_conditionType_} a.status = #{${_conditionParam_}.status}
+                </if>
+                <if test="conditionParamRef.status == null">
+                    ${_conditionType_} a.status is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('statusList')">
+                ${_conditionType_} a.status in
+                <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
+                ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
+            </if>
+            <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
+                ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('ancestors')">
+                        a.ancestors
+                        <if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('iid')">
+                        a.iid
+                        <if test='orderCol.iid != null and "DESC".equalsIgnoreCase(orderCol.iid)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pid')">
+                        a.pid
+                        <if test='orderCol.pid != null and "DESC".equalsIgnoreCase(orderCol.pid)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveSonArea')">
+                        a.haveSonArea
+                        <if test='orderCol.haveSonArea != null and "DESC".equalsIgnoreCase(orderCol.haveSonArea)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveSonDept')">
+                        a.haveSonDept
+                        <if test='orderCol.haveSonDept != null and "DESC".equalsIgnoreCase(orderCol.haveSonDept)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveGetDept')">
+                        a.haveGetDept
+                        <if test='orderCol.haveGetDept != null and "DESC".equalsIgnoreCase(orderCol.haveGetDept)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveGetMatterList')">
+                        a.haveGetMatterList
+                        <if test='orderCol.haveGetMatterList != null and "DESC".equalsIgnoreCase(orderCol.haveGetMatterList)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('areaCode')">
+                        a.areaCode
+                        <if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('areaLevel')">
+                        a.areaLevel
+                        <if test='orderCol.areaLevel != null and "DESC".equalsIgnoreCase(orderCol.areaLevel)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('shortName')">
+                        a.shortName
+                        <if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('domain')">
+                        a.domain
+                        <if test='orderCol.domain != null and "DESC".equalsIgnoreCase(orderCol.domain)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('status')">
+                        a.status
+                        <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

setup-project-manager/src/main/resources/sqlmap/module/setup/SetupProjectMapper.xml

@@ -27,6 +27,11 @@
         <result property="orderNum" column="orderNum" />
         <result property="updateUserId" column="updateUserId" />
         <result property="createUserId" column="createUserId" />
+        <result property="siteId" column="siteId" />
+        <result property="siteCode" column="siteCode" />
+        <result property="siteName" column="siteName" />
+        <result property="areaCode" column="areaCode" />
+        <result property="areaName" column="areaName" />
     </resultMap>
 
     <!-- 表所有列 -->
@@ -98,23 +103,38 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
                 a.createUserId,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                a.siteCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
+                a.areaCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))">
+                a.areaName,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SetupProjectEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_setup_project
-        (name,projectCode,projectPath,projectShell,sourceProject,dbHost,dbPort,dbUser,dbPassword,dbName,version,projectType,projectStatus,remark,updateTime,updateUser,createTime,createUser,orderNum,updateUserId,createUserId)
+        (name,projectCode,projectPath,projectShell,sourceProject,dbHost,dbPort,dbUser,dbPassword,dbName,version,projectType,projectStatus,remark,updateTime,updateUser,createTime,createUser,orderNum,updateUserId,createUserId,siteId,siteCode,siteName,areaCode,areaName)
         VALUES
-        (#{name},#{projectCode},#{projectPath},#{projectShell},#{sourceProject},#{dbHost},#{dbPort},#{dbUser},#{dbPassword},#{dbName},#{version},#{projectType},#{projectStatus},#{remark},#{updateTime},#{updateUser},#{createTime},#{createUser},#{orderNum},#{updateUserId},#{createUserId})
+        (#{name},#{projectCode},#{projectPath},#{projectShell},#{sourceProject},#{dbHost},#{dbPort},#{dbUser},#{dbPassword},#{dbName},#{version},#{projectType},#{projectStatus},#{remark},#{updateTime},#{updateUser},#{createTime},#{createUser},#{orderNum},#{updateUserId},#{createUserId},#{siteId},#{siteCode},#{siteName},#{areaCode},#{areaName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_setup_project
-        (name,projectCode,projectPath,projectShell,sourceProject,dbHost,dbPort,dbUser,dbPassword,dbName,version,projectType,projectStatus,remark,updateTime,updateUser,createTime,createUser,orderNum,updateUserId,createUserId)
+        (name,projectCode,projectPath,projectShell,sourceProject,dbHost,dbPort,dbUser,dbPassword,dbName,version,projectType,projectStatus,remark,updateTime,updateUser,createTime,createUser,orderNum,updateUserId,createUserId,siteId,siteCode,siteName,areaCode,areaName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.name},#{item.projectCode},#{item.projectPath},#{item.projectShell},#{item.sourceProject},#{item.dbHost},#{item.dbPort},#{item.dbUser},#{item.dbPassword},#{item.dbName},#{item.version},#{item.projectType},#{item.projectStatus},#{item.remark},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser},#{item.orderNum},#{item.updateUserId},#{item.createUserId})
+            (#{item.name},#{item.projectCode},#{item.projectPath},#{item.projectShell},#{item.sourceProject},#{item.dbHost},#{item.dbPort},#{item.dbUser},#{item.dbPassword},#{item.dbName},#{item.version},#{item.projectType},#{item.projectStatus},#{item.remark},#{item.updateTime},#{item.updateUser},#{item.createTime},#{item.createUser},#{item.orderNum},#{item.updateUserId},#{item.createUserId},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.areaCode},#{item.areaName})
         </foreach>
     </insert>
 
@@ -202,6 +222,24 @@
             <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
                 a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.siteCode=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
+                a.areaCode=#{data.areaCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('areaName')) or (colPickMode==1 and !data.containsKey('areaName'))">
+                a.areaName=#{data.areaName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -386,6 +424,46 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                        when a.id=#{item.id} then #{item.siteCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
+                        when a.id=#{item.id} then #{item.areaCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="areaName=(case" suffix="ELSE areaName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))">
+                        when a.id=#{item.id} then #{item.areaName}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -992,6 +1070,117 @@
             ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('siteCode')">
+            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
+            </if>
+            <if test="conditionParamRef.siteCode == null">
+                ${_conditionType_} a.siteCode is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+            ${_conditionType_} a.siteCode in
+            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+            ${_conditionType_} a.siteCode not in
+            <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
+            </if>
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('areaCode')">
+            <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
+                ${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
+            </if>
+            <if test="conditionParamRef.areaCode == null">
+                ${_conditionType_} a.areaCode is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('areaCodeList') and conditionParamRef.areaCodeList.size() > 0">
+            ${_conditionType_} a.areaCode in
+            <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('areaCodeNotList') and conditionParamRef.areaCodeNotList.size() > 0">
+            ${_conditionType_} a.areaCode not in
+            <foreach collection="conditionParamRef.areaCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('areaName')">
+            <if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''">
+                ${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
+            </if>
+            <if test="conditionParamRef.areaName == null">
+                ${_conditionType_} a.areaName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('areaNameList') and conditionParamRef.areaNameList.size() > 0">
+            ${_conditionType_} a.areaName in
+            <foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('areaNameNotList') and conditionParamRef.areaNameNotList.size() > 0">
+            ${_conditionType_} a.areaName not in
+            <foreach collection="conditionParamRef.areaNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1038,6 +1227,13 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     a.${item.colName} ${item.sortKind}
@@ -1088,6 +1284,13 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1199,6 +1402,31 @@
                     <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteCode')">
+                    a.siteCode
+                    <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteName')">
+                    a.siteName
+                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('areaCode')">
+                    a.areaCode
+                    <if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('areaName')">
+                    a.areaName
+                    <if test='orderCol.areaName != null and "DESC".equalsIgnoreCase(orderCol.areaName)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>