区域基础数据更新

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/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