Merge remote-tracking branch 'origin/dev_area_code' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -70,6 +70,9 @@ public enum EpmetErrorCode {
 	NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),
 	NOT_DEL_DEPARTMENT(8206, "该部门存在工作人员，不允许删除"),
 	NOT_DEL_AGENCY_GRID(8207, "该机关存在网格，不允许删除"),
+	AREA_CODE_ALREADY_EXISTS(8208,"组织区划已被占用，请重新选择"),
+	AGENCY_NAME_ALREADY_EXISTS(8209,"当前组织名称已存在，请重新修改"),
+	SET_PARENT_AREA_CODE(8210,"请先设置上级组织区划"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java

@@ -23,4 +23,7 @@ public interface DataSourceConstant {
      */
     String EPMET_USER = "epmetuser";
 
+    String EPMET_COMMON_SERVICE="commonservice";
+
+    String OPER_CRM="opercrm";
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java

@@ -114,17 +114,17 @@ public class CustomerAgencyDTO implements Serializable {
 	private Integer totalUser;
 
     /**
-     * 省份
+     * 【省份】名称
      */
-	private String province;
+    private String province;
 
     /**
-     * 城市
+     * 【城市】名称
      */
-	private String city;
+    private String city;
-	
+
     /**
-     * 区县
+     * 【区县】名称
      */
     private String district;
 
@@ -132,4 +132,14 @@ public class CustomerAgencyDTO implements Serializable {
      * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
      */
     private String parentAreaCode;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/NextAreaCodeFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/12 15:55
+ */
+@Data
+public class NextAreaCodeFormDTO implements Serializable {
+    private static final long serialVersionUID = -1974456701949979946L;
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "parentAgencyId不能为空",groups = AddUserInternalGroup.class)
+    private String parentAgencyId;
+
+    private String areaCode;
+
+    /**
+     * 社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province
+     */
+    @NotBlank(message = "level不能为空",groups = AddUserInternalGroup.class)
+    private String level;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/NextAreaCodeResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/12 15:56
+ */
+@Data
+public class NextAreaCodeResultDTO implements Serializable {
+    private static final long serialVersionUID = 9188265480821079966L;
+
+    private String areaCode;
+    private String areaName;
+    /**
+     * 社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province
+     */
+    private String level;
+}

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -143,6 +143,20 @@
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
 
+                <!-- epmet_common_service -->
+                <datasource.druid.commonservice.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.commonservice.url>
+                <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
+                <datasource.druid.commonservice.password>EpmEt-db-UsEr</datasource.druid.commonservice.password>
+
+                <!-- opercrm -->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -210,6 +224,20 @@
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
 
+                <!-- epmet_common_service -->
+                <datasource.druid.commonservice.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.commonservice.url>
+                <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
+                <datasource.druid.commonservice.password>EpmEt-db-UsEr</datasource.druid.commonservice.password>
+
+                <!-- opercrm -->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -277,6 +305,20 @@
                 <datasource.druid.epmetuser.username>epmet</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>elink@833066</datasource.druid.epmetuser.password>
 
+                <!-- epmet_common_service -->
+                <datasource.druid.commonservice.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.commonservice.url>
+                <datasource.druid.commonservice.username>epmet</datasource.druid.commonservice.username>
+                <datasource.druid.commonservice.password>elink@833066</datasource.druid.commonservice.password>
+
+                <!-- opercrm-->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -344,6 +386,20 @@
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
 
+                <!--  epmet_common_service-->
+                <datasource.druid.commonservice.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.commonservice.url>
+                <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
+                <datasource.druid.commonservice.password>EpmEt-db-UsEr</datasource.druid.commonservice.password>
+
+                <!-- opercrm-->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -3,13 +3,19 @@ package com.epmet.dataaggre.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.AgencyGridListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Author zxc
  * @DateTime 2020/12/25 上午9:45
@@ -34,4 +40,15 @@ public class GovOrgController {
         return new Result<AgencyGridListResultDTO>().ok(agencyGridList);
     }
 
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 新增组织-查询下一级可选的组织区划
+     * @Date 2021/4/12 16:01
+     **/
+    @PostMapping("nextlevelareacodelist")
+    public Result<List<NextAreaCodeResultDTO>> queryNextLevelAreaCodeList(@RequestBody NextAreaCodeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<NextAreaCodeResultDTO>>().ok(govOrgService.queryNextLevelAreaCodeList(formDTO));
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/commonservice/AreaCodeDao.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dao.commonservice;
+
+import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-07
+ */
+@Mapper
+public interface AreaCodeDao {
+
+    List<NextAreaCodeResultDTO> selectCityList(String areaCode);
+
+    List<NextAreaCodeResultDTO> selectDistrictList(String areaCode);
+
+    List<NextAreaCodeResultDTO> selectStreetList(String areaCode);
+
+    List<NextAreaCodeResultDTO> selectCommunityList(String areaCode);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java

@@ -47,4 +47,6 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @date 2020/12/25 下午4:55
      */
     String getAgencyIdByUserId(@Param("userId") String userId);
+
+    List<String> selectUsedAreaCodeList(@Param("parentAreaCode") String parentAreaCode);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercrm/CustomerRelationDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.opercrm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/13 10:43
+ */
+@Mapper
+public interface CustomerRelationDao {
+    List<String> selectUsedAreaCodeList(String areaCode);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java

@@ -80,17 +80,17 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	private Integer totalUser;
 
 	/**
-	 * 省份
+	 * 【省份】名称
 	 */
 	private String province;
 
 	/**
-	 * 城市
+	 * 【城市】名称
 	 */
 	private String city;
 
 	/**
-	 * 区县
+	 * 【区县】名称
 	 */
 	private String district;
 
@@ -98,4 +98,14 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
 	 */
 	private String parentAreaCode;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 社区
+	 */
+	private String community;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerDepartmentEntity.java

@@ -60,4 +60,8 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity {
      */
 	private Integer totalUser;
 
+	/**
+	 * 部门所属的行政地区编码:实际就是所属组织的地区编码
+	 */
+	private String areaCode;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/commonservice/AreaCodeService.java

@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.service.commonservice;
+
+import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
+
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/12 15:45
+ */
+public interface AreaCodeService {
+    /**
+     * @return java.util.List<com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 新增组织-查询下一级可选的组织区划
+     * @Date 2021/4/12 16:02
+     **/
+    List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/commonservice/impl/AreaCodeServiceImpl.java

@@ -0,0 +1,78 @@
+package com.epmet.dataaggre.service.commonservice.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.commonservice.AreaCodeDao;
+import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
+import com.epmet.dataaggre.service.commonservice.AreaCodeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/12 15:46
+ */
+@DataSource(DataSourceConstant.EPMET_COMMON_SERVICE)
+@Slf4j
+@Service
+public class AreaCodeServiceImpl implements AreaCodeService {
+
+    @Autowired
+    private AreaCodeDao areaCodeDao;
+
+    /**
+     * @param formDTO
+     * @return java.util.List<com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO>
+     * @author yinzuomei
+     * @description 新增组织-查询下一级可选的组织区划
+     * @Date 2021/4/12 16:02
+     **/
+    @Override
+    public List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO) {
+        List<NextAreaCodeResultDTO> list = new ArrayList<>();
+        NextAreaCodeResultDTO other = new NextAreaCodeResultDTO();
+        other.setAreaCode("other");
+        other.setAreaName("其它");
+        switch (formDTO.getLevel()) {
+            /**
+             * 社区级：community，
+             * 乡（镇、街道）级:street,
+             * 区县级: district,
+             * 市级: city
+             * 省级:province
+             */
+            case "province":
+                list = areaCodeDao.selectCityList(formDTO.getAreaCode());
+                other.setLevel("city");
+                break;
+            case "city":
+                list = areaCodeDao.selectDistrictList(formDTO.getAreaCode());
+                other.setLevel("district");
+                break;
+            case "district":
+                list = areaCodeDao.selectStreetList(formDTO.getAreaCode());
+                other.setLevel("street");
+                break;
+            case "street":
+                list = areaCodeDao.selectCommunityList(formDTO.getAreaCode());
+                other.setLevel("community");
+                break;
+            default:
+        }
+        if (CollectionUtils.isEmpty(list)) {
+            list = new ArrayList<>();
+        }
+        if(!"province".equals(formDTO.getLevel())){
+            list.add(other);
+        }
+        return list;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -1,8 +1,10 @@
 package com.epmet.dataaggre.service.govorg;
 
+import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
 
 import java.util.List;
 
@@ -42,4 +44,5 @@ public interface GovOrgService {
      */
     String getAgencyIdByUserId(String userId);
 
+    List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -1,24 +1,32 @@
 package com.epmet.dataaggre.service.govorg.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.govorg.CustomerAgencyDao;
 import com.epmet.dataaggre.dao.govorg.CustomerGridDao;
 import com.epmet.dataaggre.dao.govorg.CustomerStaffAgencyDao;
 import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
+import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
+import com.epmet.dataaggre.service.commonservice.AreaCodeService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
+import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -29,7 +37,6 @@ import java.util.List;
 @DataSource(DataSourceConstant.GOV_ORG)
 @Slf4j
 public class GovOrgServiceImpl implements GovOrgService {
-    private static final Logger logger = LoggerFactory.getLogger(GovOrgServiceImpl.class);
 
     @Autowired
     private CustomerAgencyDao customerAgencyDao;
@@ -37,7 +44,10 @@ public class GovOrgServiceImpl implements GovOrgService {
     private CustomerStaffAgencyDao customerStaffAgencyDao;
     @Autowired
     private CustomerGridDao customerGridDao;
-
+    @Autowired
+    private AreaCodeService areaCodeService;
+    @Autowired
+    private CustomerRelation customerRelation;
 
     /**
      * @param staffId
@@ -120,5 +130,72 @@ public class GovOrgServiceImpl implements GovOrgService {
         return customerAgencyDao.getAgencyIdByUserId(userId);
     }
 
+    @Override
+    public List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO) {
+        CustomerAgencyEntity parent=customerAgencyDao.selectById(formDTO.getParentAgencyId());
+        if (null == parent || StringUtils.isBlank(parent.getAreaCode())) {
+            throw new RenException(EpmetErrorCode.SET_PARENT_AREA_CODE.getCode(),EpmetErrorCode.SET_PARENT_AREA_CODE.getMsg());
+        }
+        //全部下级
+        List<NextAreaCodeResultDTO> allList = areaCodeService.queryNextLevelAreaCodeList(formDTO);
+        if (CollectionUtils.isNotEmpty(allList)) {
+            //内部客户: 已经被使用过的areaCode
+            List<String> usedAreaCodeList1 = customerAgencyDao.selectUsedAreaCodeList(formDTO.getAreaCode());
+            //外部子客户：
+            List<String> usedAreaCodeList2 = customerRelation.selectUsedAreaCodeList(formDTO.getAreaCode());
+            //已经被使用的移除不显示
+            Iterator<NextAreaCodeResultDTO> iterator = allList.iterator();
+            while (iterator.hasNext()) {
+                NextAreaCodeResultDTO next = iterator.next();
+                for (String usedAreaCode1 : usedAreaCodeList1) {
+                    if (next.getAreaCode().equals(usedAreaCode1)) {
+                        iterator.remove();
+                    }
+                }
+                for (String usedAreaCode2 : usedAreaCodeList2) {
+                    if (next.getAreaCode().contains(usedAreaCode2)) {
+                        iterator.remove();
+                    }
+                }
+            }
+        }
+        return allList;
+    }
+
+    public static void main(String[] args) {
+        List<NextAreaCodeResultDTO> allList = new ArrayList<>();
+        NextAreaCodeResultDTO m1 = new NextAreaCodeResultDTO();
+        m1.setAreaCode("1");
+        m1.setAreaName("a");
+        allList.add(m1);
+
+        NextAreaCodeResultDTO m2 = new NextAreaCodeResultDTO();
+        m2.setAreaCode("2");
+        m2.setAreaName("b");
+        allList.add(m2);
+
+
+        NextAreaCodeResultDTO m3 = new NextAreaCodeResultDTO();
+        m3.setAreaCode("3");
+        m3.setAreaName("c");
+        allList.add(m3);
+
+        List<String> stringList = new ArrayList<>();
+        stringList.add("1");
+        stringList.add("2");
+
+        Iterator<NextAreaCodeResultDTO> iterator = allList.iterator();
+        while (iterator.hasNext()) {
+            NextAreaCodeResultDTO next = iterator.next();
+            for (String usedAreaCode : stringList) {
+                if (next.getAreaCode().equals(usedAreaCode)) {
+                    iterator.remove();
+                }
+            }
+
+        }
+        System.out.println(JSON.toJSONString(allList, true));
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/CustomerRelation.java

@@ -0,0 +1,13 @@
+package com.epmet.dataaggre.service.opercrm;
+
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/13 10:38
+ */
+public interface CustomerRelation {
+    List<String> selectUsedAreaCodeList(String areaCode);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java

@@ -0,0 +1,30 @@
+package com.epmet.dataaggre.service.opercrm.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.opercrm.CustomerRelationDao;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/13 10:38
+ */
+@DataSource(DataSourceConstant.OPER_CRM)
+@Slf4j
+@Service
+public class CustomerRelationImpl implements CustomerRelation {
+    @Autowired
+    private CustomerRelationDao customerRelationDao;
+
+    @Override
+    public List<String> selectUsedAreaCodeList(String areaCode) {
+        return customerRelationDao.selectUsedAreaCodeList(areaCode);
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -119,7 +119,16 @@ dynamic:
       url: @datasource.druid.epmetuser.url@
       username: @datasource.druid.epmetuser.username@
       password: @datasource.druid.epmetuser.password@
-
+    commonservice:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.commonservice.url@
+      username: @datasource.druid.commonservice.username@
+      password: @datasource.druid.commonservice.password@
+    opercrm:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.opercrm.url@
+      username: @datasource.druid.opercrm.username@
+      password: @datasource.druid.opercrm.password@
 feign:
   hystrix:
     enabled: true

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/commonservice/AreaCodeDao.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.commonservice.AreaCodeDao">
+
+    <select id="selectCityList" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO">
+        SELECT DISTINCT
+            ac.CITY_CODE AS areaCode,
+            ac.CITY_NAME AS areaName,
+            'city' LEVEL
+        FROM
+            area_code ac
+        WHERE
+            ac.DEL_FLAG='0'
+            and  ac.PROVINCE_CODE = #{areaCode}
+        ORDER BY
+            ac.CITY_CODE ASC
+    </select>
+
+    <select id="selectDistrictList" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO">
+        SELECT DISTINCT
+            ac.COUNTY_CODE AS areaCode,
+            ac.COUNTY_NAME AS areaName,
+            'district' LEVEL
+        FROM
+            area_code ac
+        WHERE ac.DEL_FLAG='0'
+            and ac.CITY_CODE = #{areaCode}
+        ORDER BY
+            ac.COUNTY_CODE ASC
+    </select>
+
+    <select id="selectStreetList" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO">
+        SELECT DISTINCT CODE AS areaCode,
+            NAME AS areaName,
+            'street' AS LEVEL
+        FROM
+            area_code_child acc
+        WHERE
+            acc.DEL_FLAG = '0'
+            AND acc.P_CODE = #{areaCode}
+            order by acc.CODE ASC
+    </select>
+
+    <select id="selectCommunityList" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO">
+        SELECT DISTINCT CODE AS areaCode,
+            NAME AS areaName,
+            'community' AS LEVEL
+        FROM
+            area_code_child acc
+        WHERE
+            acc.DEL_FLAG = '0'
+            AND acc.P_CODE = #{areaCode}
+        ORDER BY
+            acc.CODE ASC
+    </select>
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -22,4 +22,13 @@
         SELECT AGENCY_ID FROM customer_staff_agency WHERE DEL_FLAG = 0 AND USER_ID = #{userId}
     </select>
 
+    <select id="selectUsedAreaCodeList" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            distinct ca.AREA_CODE
+        FROM
+            customer_agency ca
+        WHERE
+            ca.DEL_FLAG = '0'
+            AND ca.PARENT_AREA_CODE = #{parentAreaCode}
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.opercrm.CustomerRelationDao">
+
+    <select id="selectUsedAreaCodeList" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            cr.AREA_CODE
+        FROM
+            customer_relation cr
+        WHERE
+            cr.DEL_FLAG = '0'
+            and  cr.CUSTOMER_TYPE='external'
+            AND cr.AREA_CODE LIKE concat(#{areaCode}, '%')
+            AND cr.AREA_CODE != #{areaCode}
+    </select>
+</mapper>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java

@@ -80,17 +80,17 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	private Integer totalUser;
 
 	/**
-	 * 省份
+	 * 【省份】名称
 	 */
 	private String province;
 
 	/**
-	 * 城市
+	 * 【城市】名称
 	 */
 	private String city;
 
 	/**
-	 * 区县
+	 * 【区县】名称
 	 */
 	private String district;
 
@@ -98,4 +98,14 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 * 当前组织的上级行政地区编码add0204;举例平阴县370124对应的是济南市3701
 	 */
 	private String parentAreaCode;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 社区
+	 */
+	private String community;
 }

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AddAreaCodeFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/13 14:36
+ */
+@Data
+public class AddAreaCodeFormDTO implements Serializable {
+
+    @NotBlank(message = "currentAreaLevel不能为空")
+    private String currentAreaLevel;
+    @NotBlank(message = "parentAreaCode不能为空")
+    private String parentAreaCode;
+
+    /**
+     * 新增的街道或者社区名称
+     */
+    @NotBlank(message = "name不能为空")
+    private String name;
+}

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java

@@ -113,4 +113,14 @@ public interface EpmetCommonServiceOpenFeignClient {
      **/
     @PostMapping(value = "commonservice/areacode/addstreetcommareacode", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> addStreetCommAreaCode(@RequestBody AddAreaCodeDictFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 自定义行政地区编码
+     * @Date 2021/4/13 14:31
+     **/
+    @PostMapping(value = "commonservice/areacode/addareacode", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> addAreaCode(AddAreaCodeFormDTO formDTO);
 }

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@@ -89,4 +89,16 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
     public Result<String> addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "addStreetCommAreaCode", formDTO);
     }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 自定义行政地区编码
+     * @Date 2021/4/13 14:31
+     **/
+    @Override
+    public Result<String> addAreaCode(AddAreaCodeFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "addAreaCode", formDTO);
+    }
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java

@@ -26,4 +26,8 @@ public interface AreaCodeConstant {
 
     String LEVEL_ERROR = "RootAreaLevel填写错误【%s】";
 
+    String FIRST_THREE_UD="001_UD";
+
+    String FIRST_TOW_UD="01_UD";
+    String UD="_UD";
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.AreaCodeDTO;
 import com.epmet.dto.form.AddAreaCodeDictFormDTO;
+import com.epmet.dto.form.AddAreaCodeFormDTO;
 import com.epmet.dto.form.AreaCodeDictFormDTO;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.service.AreaCodeService;
@@ -107,4 +108,17 @@ public class AreaCodeController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<String>().ok(areaCodeService.addStreetCommAreaCode(formDTO));
     }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 自定义行政地区编码-产品自身使用
+     * @Date 2021/4/13 14:40
+     **/
+    @PostMapping(value = "addareacode")
+    Result<String> addAreaCode(@RequestBody AddAreaCodeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<String>().ok(areaCodeService.addAreaCode(formDTO));
+    }
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java

@@ -36,4 +36,8 @@ public interface AreaCodeDao extends BaseDao<AreaCodeEntity> {
     List<AreaCodeDTO> selectAllArea();
 
     AreaCodeDTO selectByCountyCode(String countyCode);
+
+    AreaCodeDTO selectByCityCode(String cityCode);
+
+    AreaCodeDTO selectMaxCounty(String cityCode);
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.AreaCodeDTO;
 import com.epmet.dto.form.AddAreaCodeDictFormDTO;
+import com.epmet.dto.form.AddAreaCodeFormDTO;
 import com.epmet.dto.form.AreaCodeDictFormDTO;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.entity.AreaCodeEntity;
@@ -113,4 +114,13 @@ public interface AreaCodeService extends BaseService<AreaCodeEntity> {
      * @Date 2021/2/5 17:39
      **/
     String addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO);
+
+    /**
+     * @return java.lang.String
+     * @param formDTO
+     * @author yinzuomei
+     * @description 自定义行政地区编码
+     * @Date 2021/4/13 14:40
+     **/
+    String addAreaCode(AddAreaCodeFormDTO formDTO);
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -34,6 +34,7 @@ import com.epmet.dao.AreaCodeDao;
 import com.epmet.dto.AreaCodeChildDTO;
 import com.epmet.dto.AreaCodeDTO;
 import com.epmet.dto.form.AddAreaCodeDictFormDTO;
+import com.epmet.dto.form.AddAreaCodeFormDTO;
 import com.epmet.dto.form.AreaCodeDictFormDTO;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.entity.AreaCodeEntity;
@@ -588,7 +589,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      **/
     @Override
     public String addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) {
-        String originalParentCode = formDTO.getParentAreaCode().replaceAll("_UD", "");
+        String originalParentCode = formDTO.getParentAreaCode().replaceAll(AreaCodeConstant.UD, "");
         if (originalParentCode.length() < NumConstant.SIX) {
             throw new RenException("目前只允许添加街道或社区");
         }
@@ -624,13 +625,13 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             //如果是增加街道
             areaCodeChildDTO.setLevel(NumConstant.FOUR);
         } else {
-            areaCodeChildDTO.setLevel(null != parent && null != parent.getLevel() ? parent.getLevel() + 1 : null);
+            areaCodeChildDTO.setLevel(null != parent && null != parent.getLevel() ? parent.getLevel() + NumConstant.ONE : null);
         }
         //获取子级中最大的编码
         AreaCodeChildDTO maxChildDto = childDao.selectMaxChild(formDTO.getParentAreaCode().trim());
         if (null == maxChildDto) {
             //默认添加001
-            areaCodeChildDTO.setCode(formDTO.getParentAreaCode().concat("001_UD"));
+            areaCodeChildDTO.setCode(formDTO.getParentAreaCode().concat(AreaCodeConstant.FIRST_THREE_UD));
         } else {
             //去掉_UD +1赋值;370124001225_UD  锦源社区
             /*String[] codeArr = maxChildDto.getCode().split(StrConstant.UNDER_LINE);
@@ -641,14 +642,14 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             long num = Long.parseLong(codeArr[NumConstant.ZERO]) + NumConstant.ONE;
             String numStr = String.valueOf(num);
             String temp = "";
-            if (numStr.length() == 2) {
+            if (numStr.length() == NumConstant.TWO) {
-                temp = "0".concat(numStr);
+                temp = NumConstant.ZERO_STR.concat(numStr);
-            } else if (numStr.length() == 1) {
+            } else if (numStr.length() == NumConstant.ONE) {
                 temp = "00".concat(numStr);
             } else {
                 temp = numStr;
             }
-            areaCodeChildDTO.setCode(formDTO.getParentAreaCode().concat(temp).concat("_UD"));
+            areaCodeChildDTO.setCode(formDTO.getParentAreaCode().concat(temp).concat(AreaCodeConstant.UD));
             /*log.info("最大="+maxChildDto.getCode()+";去初父级("+formDTO.getParentAreaCode()+"):"+subStr);
             log.info("数字位+1="+num);
             log.info("temp="+temp);*/
@@ -657,4 +658,59 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         areaCodeChildService.save(areaCodeChildDTO);
         return areaCodeChildDTO.getCode();
     }
+
+    /**
+     * @param formDTO
+     * @return java.lang.String
+     * @author yinzuomei
+     * @description 自定义行政地区编码
+     * @Date 2021/4/13 14:40
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String addAreaCode(AddAreaCodeFormDTO formDTO) {
+        String areaCode = "";
+        switch (formDTO.getCurrentAreaLevel()) {
+            case AreaCodeConstant.DISTRICT:
+                areaCode = addDistrictAreaCode(formDTO.getParentAreaCode(),formDTO.getName());
+                break;
+            case AreaCodeConstant.STREET:
+                areaCode = addStreetCommAreaCode(ConvertUtils.sourceToTarget(formDTO,AddAreaCodeDictFormDTO.class));
+                break;
+            case AreaCodeConstant.COMMUNITY:
+                areaCode = addStreetCommAreaCode(ConvertUtils.sourceToTarget(formDTO,AddAreaCodeDictFormDTO.class));
+                break;
+            default:
+                log.info("currentAreaLevel值为"+formDTO.getCurrentAreaLevel());
+        }
+        return areaCode;
+    }
+
+
+    private String addDistrictAreaCode(String cityCode, String countyName) {
+        AreaCodeDTO city = baseDao.selectByCityCode(cityCode);
+        AreaCodeEntity insert = ConvertUtils.sourceToTarget(city, AreaCodeEntity.class);
+        insert.setCityName(countyName);
+        AreaCodeDTO maxCountyDTO = baseDao.selectMaxCounty(cityCode);
+        if (null == maxCountyDTO) {
+            insert.setCountyCode(cityCode.concat(AreaCodeConstant.FIRST_TOW_UD));
+        } else {
+            //山东省37
+            //济南市3701
+            //济南高新技术产业开发区370171
+            //370172_UD
+            if (NumConstant.SIX == maxCountyDTO.getCountyCode().length()) {
+                long maxCountyCode = Long.parseLong(maxCountyDTO.getCountyCode());
+                long newCountyCode = maxCountyCode + NumConstant.ONE;
+                insert.setCountyCode(String.valueOf(newCountyCode).concat(AreaCodeConstant.UD));
+            } else {
+                String countyCode = maxCountyDTO.getCountyCode().replace(AreaCodeConstant.UD, StrConstant.EPMETY_STR);
+                long maxCountyCode = Long.parseLong(countyCode);
+                long newCountyCode = maxCountyCode + NumConstant.ONE;
+                insert.setCountyCode(String.valueOf(newCountyCode).concat(AreaCodeConstant.UD));
+            }
+        }
+        baseDao.insert(insert);
+        return insert.getCountyCode();
+    }
 }

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml

@@ -11,4 +11,20 @@
     <select id="selectByCountyCode" resultType="com.epmet.dto.AreaCodeDTO">
         select * from area_code m where m.COUNTY_CODE=#{countyCode}
     </select>
+
+    <select id="selectByCityCode" resultType="com.epmet.dto.AreaCodeDTO" parameterType="java.lang.String">
+        select distinct ac.PROVINCE_CODE,ac.PROVINCE_NAME,ac.CITY_CODE,ac.CITY_NAME
+        from area_code ac
+        where ac.DEL_FLAG='0'
+        and ac.CITY_CODE=#{cityCode}
+    </select>
+
+    <select id="selectMaxCounty" resultType="com.epmet.dto.AreaCodeDTO" parameterType="java.lang.String">
+        select *
+        from area_code ac
+        where ac.DEL_FLAG='0'
+        and ac.CITY_CODE=#{cityCode}
+        order by ac.COUNTY_CODE desc
+        limit 1
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java

@@ -114,15 +114,15 @@ public class CustomerAgencyDTO implements Serializable {
 	private Integer totalUser;
 
     /**
-     * 省份
+     * 省
      */
-	private String province;
+    private String province;
 
     /**
-     * 城市
+     * 市
      */
-	private String city;
+    private String city;
-	
+
     /**
      * 区县
      */
@@ -132,4 +132,14 @@ public class CustomerAgencyDTO implements Serializable {
      * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
      */
     private String parentAreaCode;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrgParameterDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 客户组织相关参数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-12
+ */
+@Data
+public class CustomerOrgParameterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:area_code_switch
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:是否开启区域编码
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:开启：open；关闭：closed 
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:open:当前客户新增组织需要选择areaCode；closed:  无需选择区域编码
+     */
+	private String description;
+
+    /**
+     * 删除标志 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java

@@ -0,0 +1,90 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 添加组织V2
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/13 11:08
+ */
+@Data
+public class AddAgencyV2FormDTO implements Serializable {
+    private static final long serialVersionUID = -8951334902226679043L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface DefaultUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface AreaCodeGroup extends CustomerClientShowGroup {
+    }
+
+
+    @NotBlank(message = "上级组织ID不能为空", groups = AddUserInternalGroup.class)
+    private String parentAgencyId;
+
+    /**
+     * 机构组织名称
+     */
+    @NotBlank(message = "组织名称不能为空", groups = DefaultUserShowGroup.class)
+    @Length(max = 50, message = "组织名称不能超过50个字", groups = DefaultUserShowGroup.class)
+    private String agencyName;
+
+    /**
+     * 机关级别（社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province）
+     */
+    @NotBlank(message = "组织级别不能为空;社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province", groups = AddUserInternalGroup.class)
+    private String level;
+
+    /**
+     * open: 选择地区编码必填；closed:  无需选择地区编码;0409新增返参
+     */
+    @NotBlank(message = "areaCodeSwitch不能为空", groups = AddUserInternalGroup.class)
+    private String areaCodeSwitch;
+
+    /**
+     * 地区编码
+     */
+    @NotBlank(message = "请选择组织区划", groups = AreaCodeGroup.class)
+    private String areaCode;
+
+    // /**
+    //  * 省份
+    //  */
+    // private String province;
+    //
+    // /**
+    //  * 城市
+    //  */
+    // private String city;
+    //
+    // /**
+    //  * 区县
+    //  */
+    // private String district;
+    //
+    // /**
+    //  * 街道
+    //  */
+    // private String street;
+    //
+    // /**
+    //  * 社区
+    //  */
+    // private String community;
+
+    //区域编码名称
+    @NotBlank(message = "", groups = AreaCodeGroup.class)
+    private String areaName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -33,23 +34,29 @@ import java.io.Serializable;
 public class EditAgencyFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    public interface AddUserInternalGroup {
+    }
+
+    public interface DefaultUserShowGroup extends CustomerClientShowGroup {
+    }
 
     /**
      * 机关组织Id
      */
-    @NotBlank(message = "机关组织ID不能为空")
+    @NotBlank(message = "机关组织ID不能为空", groups = AddUserInternalGroup.class)
     private String agencyId;
 
     /**
      * 机关组织名称
      */
     @NotBlank(message = "机关组织名称不能为空")
-    @Length(max=50,message = "机构名称不能超过50个字")
+    @Length(max=50,message = "机构名称不能超过50个字",groups = DefaultUserShowGroup.class)
     private String agencyName;
 
     /**
      * token中用户Id
      */
+    @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
     private String userId;
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddAgencyResultDTO.java

@@ -33,8 +33,18 @@ public class AddAgencyResultDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 机关组织Id
+     * 新添加的组织Id
      */
-    private String agencyId = "";
+    private String agencyId;
 
+
+    /**
+     * 新添加的组织地区编码
+     */
+    private String areaCode;
+
+    /**
+     * open: 选择地区编码必填；closed:  无需选择地区编码;0409新增返参
+     */
+    private String areaCodeSwitch;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java

@@ -58,17 +58,17 @@ public class AgencysResultDTO implements Serializable {
     private String areaCode = "";
 
     /**
-     * 省份
+     * 【省份】名称
      */
     private String province = "";
 
     /**
-     * 城市
+     * 【城市】名称
      */
     private String city = "";
 
     /**
-     * 区县
+     * 【区县】名称
      */
     private String district = "";
 
@@ -76,4 +76,24 @@ public class AgencysResultDTO implements Serializable {
      * 本机关的所有上级机关
      */
     private List<ParentListResultDTO> parentList;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参
+     */
+    private String areaCodeSwitch;
+
+    /**
+     * 组织区划的名称
+     */
+    private String areaName;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java

@@ -58,5 +58,6 @@ public class DepartmentDetailResultDTO implements Serializable {
      */
     private List<DepartInStaffListResultDTO> staffList;
 
+    private String areaCode;
 
 }

epmet-module/gov-org/gov-org-server/pom.xml

@@ -101,6 +101,12 @@
             <artifactId>epmet-commons-rocketmq</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>common-service-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java

@@ -26,6 +26,15 @@ public interface CustomerAgencyConstant {
 	 * 机关级别-市级
 	 */
 	String CITY_LEVEL = "city";
+
+	// 社区级：community，
+	String COMMUNITY_LEVEL="community";
+
+	// 乡（镇、街道）级:street,
+	String STREET_LEVEL="street";
+
+	// 区县级: district,
+	String DISTRICT="district";
 	/**
 	 * 市级名称不能为空
 	 */
@@ -71,4 +80,13 @@ public interface CustomerAgencyConstant {
 	 * 获取工作人员组织信息失败
 	 */
 	String SELECT_STAFF_AGENCY_EXCEPTION = "获取工作人员组织信息失败";
+
+	/**
+	 * 参数(area_code_switch)值open: 选择地区编码必填；closed:
+	 */
+	String AREA_CODE_SWITCH="area_code_switch";
+
+	String AREA_CODE_SWITCH_CLOSED="closed";
+
+	String AREA_CODE_SWITCH_OPEN="open";
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -33,6 +33,7 @@ import com.epmet.dto.result.AgencysResultDTO;
 import com.epmet.dto.result.SubAgencyResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.service.AgencyService;
+import com.epmet.service.CustomerAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,8 @@ public class AgencyController {
 
     @Autowired
     private AgencyService agencyService;
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
 
     /**
      * @param formDTO
@@ -81,6 +84,25 @@ public class AgencyController {
         return agencyService.addAgency(formDTO);
     }
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.AddAgencyResultDTO>
+     * @author yinzuomei
+     * @description 添加组织V2
+     * @Date 2021/4/13 11:09
+     **/
+    @PostMapping("addagency-v2")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_CREATE)
+    public Result<AddAgencyResultDTO> addAgencyV2(@LoginUser TokenDto tokenDTO,@RequestBody AddAgencyV2FormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddAgencyV2FormDTO.DefaultUserShowGroup.class, AddAgencyV2FormDTO.AddUserInternalGroup.class);
+        if (formDTO.getAreaCodeSwitch().equals(CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN)) {
+            ValidatorUtils.validateEntity(formDTO, AddAgencyV2FormDTO.AreaCodeGroup.class);
+        }
+        //当前客户下，同级组织中，组织名称不允许重复
+        customerAgencyService.checkAgencyName(formDTO.getAgencyName(),tokenDTO.getCustomerId(),formDTO.getLevel(),null);
+        return new Result<AddAgencyResultDTO>().ok(agencyService.addAgencyV2(formDTO));
+    }
+
     /**
      * 添加根级组织
      * @param form
@@ -105,7 +127,7 @@ public class AgencyController {
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE)
     public Result editAgency(@LoginUser TokenDto tokenDTO, @RequestBody EditAgencyFormDTO formDTO) {
         formDTO.setUserId(tokenDTO.getUserId());
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, EditAgencyFormDTO.DefaultUserShowGroup.class, EditAgencyFormDTO.AddUserInternalGroup.class);
         return agencyService.editAgency(formDTO);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -224,4 +224,12 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @Date 2020/12/15 10:04
      **/
     int delByAgencyId(@Param("agencyId") String agencyId, @Param("operateUserId") String operateUserId);
+
+    List<String> selectAgencyIdsByAreaCode(@Param("areaCode") String areaCode,
+                                           @Param("agencyId") String agencyId);
+
+    List<CustomerAgencyEntity> checkAgencyName(@Param("agencyName") String agencyName,
+                                               @Param("customerId") String customerId,
+                                               @Param("level") String level,
+                                               @Param("agencyId") String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrgParameterDao.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.CustomerOrgParameterEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 客户组织相关参数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-12
+ */
+@Mapper
+public interface CustomerOrgParameterDao extends BaseDao<CustomerOrgParameterEntity> {
+
+    /**
+     * @return com.epmet.entity.CustomerOrgParameterEntity
+     * @param customerId
+     * @param parameterKey
+     * @author yinzuomei
+     * @description  根据customerId查询参数(area_code_switch)值
+     * @Date 2021/4/12 14:26
+     **/
+    CustomerOrgParameterEntity selectByCustomerId(@Param("customerId") String customerId, @Param("parameterKey") String parameterKey);
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java

@@ -80,17 +80,17 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	private Integer totalUser;
 
 	/**
-	 * 省份
+	 * 省
 	 */
 	private String province;
 
 	/**
-	 * 城市
+	 * 【城市】名称
 	 */
 	private String city;
 
 	/**
-	 * 区县
+	 * 【区县】名称
 	 */
 	private String district;
 
@@ -98,4 +98,14 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
 	 */
 	private String parentAreaCode;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 【社区】名称0409
+	 */
+	private String community;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java

@@ -60,4 +60,8 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity {
      */
 	private Integer totalUser;
 
+	/**
+	 * 部门所属的行政地区编码:实际就是所属组织的地区编码
+	 */
+	private String areaCode;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrgParameterEntity.java

@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 客户组织相关参数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-12
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("customer_org_parameter")
+public class CustomerOrgParameterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:area_code_switch
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:是否开启区域编码
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:开启：open；关闭：closed 
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:open:当前客户新增组织需要选择areaCode；closed:  无需选择区域编码
+     */
+	private String description;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java

@@ -108,4 +108,13 @@ public interface AgencyService {
      * @Date 2020/7/16 17:13
      **/
     void saveRootAgency(AddAgencyAndStaffFormDTO agencyAndStaff);
+
+    /**
+     * 添加组织V2
+     *
+     * @param formDTO rule id
+     * @return com.epmet.dto.result.AddAgencyResultDTO
+     */
+    AddAgencyResultDTO addAgencyV2(AddAgencyV2FormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -234,4 +234,6 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @author sun
      **/
     OrganizeTreeResultDTO organizeTree(String agencyId);
+
+    void checkAgencyName(String agencyName,String customerId,String level,String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrgParameterService.java

@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.CustomerOrgParameterDTO;
+import com.epmet.entity.CustomerOrgParameterEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客户组织相关参数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-12
+ */
+public interface CustomerOrgParameterService extends BaseService<CustomerOrgParameterEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<CustomerOrgParameterDTO>
+     * @author generator
+     * @date 2021-04-12
+     */
+    PageData<CustomerOrgParameterDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<CustomerOrgParameterDTO>
+     * @author generator
+     * @date 2021-04-12
+     */
+    List<CustomerOrgParameterDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return CustomerOrgParameterDTO
+     * @author generator
+     * @date 2021-04-12
+     */
+    CustomerOrgParameterDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-04-12
+     */
+    void save(CustomerOrgParameterDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-04-12
+     */
+    void update(CustomerOrgParameterDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-04-12
+     */
+    void delete(String[] ids);
+
+    /**
+     * @return java.lang.String
+     * @param customerId
+     * @author yinzuomei
+     * @description 根据customerId查询参数(area_code_switch)值open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参;没配置,返回closed
+     * @Date 2021/4/12 14:23
+     **/
+    String getAreaCodeSwitch(String customerId);
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -33,10 +34,13 @@ import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.AgencyService;
 import com.epmet.service.CustomerAgencyService;
+import com.epmet.service.CustomerOrgParameterService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +49,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 机关单位信息
@@ -70,6 +76,12 @@ public class AgencyServiceImpl implements AgencyService {
     private CustomerGridDao customerGridDao;
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private CustomerOrgParameterService customerOrgParameterService;
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
+
+
     /**
      * @param formDTO
      * @return
@@ -120,11 +132,12 @@ public class AgencyServiceImpl implements AgencyService {
     @Transactional(rollbackFor = Exception.class)
     public Result editAgency(EditAgencyFormDTO formDTO) {
         Result result = new Result();
-        CustomerAgencyEntity entity = new CustomerAgencyEntity();
+        CustomerAgencyEntity originalEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
-        entity.setId(formDTO.getAgencyId());
+        //当前客户下，同级组织中，组织名称不允许重复
-        entity.setOrganizationName(formDTO.getAgencyName());
+        customerAgencyService.checkAgencyName(formDTO.getAgencyName(),originalEntity.getCustomerId(),originalEntity.getLevel(),originalEntity.getId());
+        originalEntity.setOrganizationName(formDTO.getAgencyName());
         //1:更新当前组织信息
-        if (customerAgencyDao.updateById(entity) < NumConstant.ONE) {
+        if (customerAgencyDao.updateById(originalEntity) < NumConstant.ONE) {
             log.error(CustomerAgencyConstant.UPDATE_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.UPDATE_EXCEPTION);
         }
@@ -137,9 +150,7 @@ public class AgencyServiceImpl implements AgencyService {
         }
         //3:循环组织列表，查询每一个组织的所有上级组织重新拼接所有上级名称(allParentName)字段值
         List<CustomerAgencyEntity> editList = new ArrayList<>();
-        Date date = new Date();
         agencyList.forEach(agency->{
-            CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
             //3-1:查询当前组织的所有上级组织
             List<String> listStr = Arrays.asList(agency.getPids().split(":"));
             List<ParentListResultDTO> parentList = customerAgencyDao.selectPAgencyById(listStr);
@@ -152,10 +163,9 @@ public class AgencyServiceImpl implements AgencyService {
                     allParentName.append("-").append(parents.getName());
                 }
             });
-            customerAgencyEntity.setId(agency.getId());
+            CustomerAgencyEntity customerAgencyEntity = ConvertUtils.sourceToTarget(agency,CustomerAgencyEntity.class);
             customerAgencyEntity.setAllParentName(allParentName.toString());
             customerAgencyEntity.setUpdatedBy(formDTO.getUserId());
-            customerAgencyEntity.setUpdatedTime(date);
             editList.add(customerAgencyEntity);
         });
         //4:批量更新因一个组织名称变动而引起的其他组织字段值的变动
@@ -235,9 +245,38 @@ public class AgencyServiceImpl implements AgencyService {
         List<String> listStr = Arrays.asList(entity.getPids().split(":"));
         parentList = customerAgencyDao.selectPAgencyById(listStr);
         agencysResultDTO.setParentList(parentList);
+        agencysResultDTO.setAreaCodeSwitch(customerOrgParameterService.getAreaCodeSwitch(entity.getCustomerId()));
+        agencysResultDTO.setAreaName(StrConstant.EPMETY_STR);
+        agencysResultDTO.setAreaCode(StringUtils.isNotBlank(entity.getAreaCode())?entity.getAreaCode():StrConstant.EPMETY_STR);
+        //查询组织区划的名称
+        if (null != entity && StringUtils.isNotBlank(entity.getAreaCode())) {
+            switch (entity.getLevel()) {
+                case CustomerAgencyConstant.PROVINCE_LEVEL:
+                    agencysResultDTO.setAreaName(null == entity.getProvince() ? StrConstant.EPMETY_STR : entity.getProvince());
+                    break;
+                case CustomerAgencyConstant.CITY_LEVEL:
+                    agencysResultDTO.setAreaName(null == entity.getCity() ? StrConstant.EPMETY_STR : entity.getCity());
+                    break;
+                case CustomerAgencyConstant.DISTRICT:
+                    agencysResultDTO.setAreaName(null == entity.getDistrict() ? StrConstant.EPMETY_STR : entity.getDistrict());
+                    break;
+                case CustomerAgencyConstant.STREET_LEVEL:
+                    agencysResultDTO.setAreaName(null == entity.getStreet() ? StrConstant.EPMETY_STR : entity.getStreet());
+                    break;
+                case CustomerAgencyConstant.COMMUNITY_LEVEL:
+                    agencysResultDTO.setAreaName(null == entity.getCommunity() ? StrConstant.EPMETY_STR : entity.getCommunity());
+                    break;
+                default:
+                    agencysResultDTO.setAreaName(StrConstant.EPMETY_STR);
+            }
+        }
         return new Result<AgencysResultDTO>().ok(agencysResultDTO);
     }
 
+    public static void main(String[] args) {
+        String m="1234";
+        System.out.println(m.equals("1234") ? "yes" : "no");
+    }
     /**
      * @param formDTO
      * @return
@@ -380,4 +419,99 @@ public class AgencyServiceImpl implements AgencyService {
 
     }
 
+    /**
+     * 添加组织V2
+     *
+     * @param formDTO rule id
+     * @return com.epmet.dto.result.AddAgencyResultDTO
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public AddAgencyResultDTO addAgencyV2(AddAgencyV2FormDTO formDTO) {
+        CustomerAgencyDTO parent = customerAgencyService.get(formDTO.getParentAgencyId());
+        if (null == parent) {
+            throw new RenException(String.format("添加组织失败:没有找到上级组织信息,agencyId=%s", formDTO.getParentAgencyId()));
+        }
+        AddAgencyResultDTO resultDTO = new AddAgencyResultDTO();
+        resultDTO.setAreaCodeSwitch(formDTO.getAreaCodeSwitch());
+        CustomerAgencyEntity insertEntity=this.constructInsertEntity(formDTO,parent);
+        //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
+        if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
+            //校验areaCode是否被使用过
+            if (!"other".equals(formDTO.getAreaCode())) {
+                List<String> agencyIds = customerAgencyDao.selectAgencyIdsByAreaCode(insertEntity.getAreaCode(),null);
+                if (CollectionUtils.isNotEmpty(agencyIds)) {
+                    //已经被占用，提示
+                    throw new RenException(EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getCode(), EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getMsg());
+                }
+            }else{
+                //如果选择的是other,需要自定义一个编码
+                AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
+                addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
+                addAreaCodeFormDTO.setParentAreaCode(parent.getAreaCode());
+                addAreaCodeFormDTO.setName(formDTO.getAgencyName());
+                Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
+                if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
+                    throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+                }
+                insertEntity.setAreaCode(addAreaCodeResult.getData());
+            }
+        }
+        customerAgencyDao.insert(insertEntity);
+        //3:返回新组织Id
+        resultDTO.setAgencyId(insertEntity.getId());
+        resultDTO.setAreaCode(insertEntity.getAreaCode());
+        return resultDTO;
+    }
+
+    private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
+        CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
+        insertEntity.setOrganizationName(formDTO.getAgencyName());
+        insertEntity.setTotalUser(NumConstant.ZERO);
+        insertEntity.setPid(parent.getId());
+        insertEntity.setCustomerId(parent.getCustomerId());
+        insertEntity.setParentAreaCode(parent.getAreaCode());
+        if (StringUtils.isBlank(parent.getPid()) || NumConstant.ZERO_STR.equals(parent.getPid())) {
+            //如果上级是根级组织
+            insertEntity.setPids(parent.getId());
+            insertEntity.setAllParentName(parent.getOrganizationName());
+        } else {
+            insertEntity.setPids(parent.getPids().concat(StrConstant.COLON).concat(parent.getId()));
+            insertEntity.setAllParentName(parent.getAllParentName().concat(StrConstant.HYPHEN).concat(parent.getOrganizationName()));
+        }
+        switch(parent.getLevel())
+        {
+            case CustomerAgencyConstant.PROVINCE_LEVEL:
+                insertEntity.setLevel(CustomerAgencyConstant.CITY_LEVEL);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(formDTO.getAreaName());
+                break;
+            case CustomerAgencyConstant.CITY_LEVEL:
+                insertEntity.setLevel(CustomerAgencyConstant.DISTRICT);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(parent.getCity());
+                insertEntity.setDistrict(formDTO.getAreaName());
+                break;
+            case CustomerAgencyConstant.DISTRICT:
+                insertEntity.setLevel(CustomerAgencyConstant.STREET_LEVEL);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(parent.getCity());
+                insertEntity.setDistrict(parent.getDistrict());
+                insertEntity.setStreet(formDTO.getAreaName());
+                break;
+            case CustomerAgencyConstant.STREET_LEVEL:
+                insertEntity.setLevel(CustomerAgencyConstant.COMMUNITY_LEVEL);
+                insertEntity.setProvince(parent.getProvince());
+                insertEntity.setCity(parent.getCity());
+                insertEntity.setDistrict(parent.getDistrict());
+                insertEntity.setStreet(parent.getStreet());
+                insertEntity.setCommunity(formDTO.getAreaName());
+                break;
+            default:
+                log.info("parent.getLevel()="+parent.getLevel());
+                break;
+        }
+        return insertEntity;
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -40,6 +41,7 @@ import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.util.ModuleConstant;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1057,4 +1059,12 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return baseDao.selectorganizeTree(agencyId);
     }
 
+    @Override
+    public void checkAgencyName(String agencyName,String customerId,String level,String agencyId) {
+        List<CustomerAgencyEntity> entityList = baseDao.checkAgencyName(agencyName,customerId,level,agencyId);
+        if (CollectionUtils.isNotEmpty(entityList)) {
+            throw new RenException(EpmetErrorCode.AGENCY_NAME_ALREADY_EXISTS.getCode(), EpmetErrorCode.AGENCY_NAME_ALREADY_EXISTS.getMsg());
+        }
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -244,6 +245,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setAreaCode(customerAgencyDTO.getAreaCode());
         customerGridEntity.setCustomerId(customerAgencyDTO.getCustomerId());
         customerGridEntity.setPid(addGridFormDTO.getAgencyId());
+
+        //新增area_code,部门的area_code=所属组织的area_code
+        customerGridEntity.setAreaCode(null != customerAgencyDTO && StringUtils.isNotBlank(customerAgencyDTO.getAreaCode()) ? customerAgencyDTO.getAreaCode() : StrConstant.EPMETY_STR);
+
         //所有上级机构id，必须包括当前机构id （放在所有上级机构id后）
         if(StringUtils.isBlank(customerAgencyDTO.getPids())){
             customerGridEntity.setPids(addGridFormDTO.getAgencyId());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrgParameterServiceImpl.java

@@ -0,0 +1,116 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.CustomerAgencyConstant;
+import com.epmet.dao.CustomerOrgParameterDao;
+import com.epmet.dto.CustomerOrgParameterDTO;
+import com.epmet.entity.CustomerOrgParameterEntity;
+import com.epmet.service.CustomerOrgParameterService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客户组织相关参数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-12
+ */
+@Service
+public class CustomerOrgParameterServiceImpl extends BaseServiceImpl<CustomerOrgParameterDao, CustomerOrgParameterEntity> implements CustomerOrgParameterService {
+
+    @Override
+    public PageData<CustomerOrgParameterDTO> page(Map<String, Object> params) {
+        IPage<CustomerOrgParameterEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, CustomerOrgParameterDTO.class);
+    }
+
+    @Override
+    public List<CustomerOrgParameterDTO> list(Map<String, Object> params) {
+        List<CustomerOrgParameterEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, CustomerOrgParameterDTO.class);
+    }
+
+    private QueryWrapper<CustomerOrgParameterEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<CustomerOrgParameterEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public CustomerOrgParameterDTO get(String id) {
+        CustomerOrgParameterEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, CustomerOrgParameterDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(CustomerOrgParameterDTO dto) {
+        CustomerOrgParameterEntity entity = ConvertUtils.sourceToTarget(dto, CustomerOrgParameterEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(CustomerOrgParameterDTO dto) {
+        CustomerOrgParameterEntity entity = ConvertUtils.sourceToTarget(dto, CustomerOrgParameterEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @param customerId
+     * @return java.lang.String
+     * @author yinzuomei
+     * @description 根据customerId查询参数(area_code_switch)值open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参;没配置,返回closed
+     * @Date 2021/4/12 14:23
+     **/
+    @Override
+    public String getAreaCodeSwitch(String customerId) {
+        CustomerOrgParameterEntity entity = baseDao.selectByCustomerId(customerId, CustomerAgencyConstant.AREA_CODE_SWITCH);
+        if (null == entity || StringUtils.isBlank(entity.getParameterValue())) {
+            return CustomerAgencyConstant.AREA_CODE_SWITCH_CLOSED;
+        }
+        return entity.getParameterValue();
+    }
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -90,6 +91,8 @@ public class DepartmentServiceImpl implements DepartmentService {
         //1:查询当前组织机构信息，获取客户Id
         CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
         entity.setCustomerId(parentEntity.getCustomerId());
+        //新增area_code,部门的area_code=所属组织的area_code
+        entity.setAreaCode(null!=parentEntity&&StringUtils.isNotBlank(parentEntity.getAreaCode())?parentEntity.getAreaCode(): StrConstant.EPMETY_STR);
         //2:保存部门信息
         if (customerDepartmentDao.insert(entity) < NumConstant.ONE) {
             log.error(CustomerDepartmentConstant.SAVE_EXCEPTION);

epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml

@@ -128,14 +128,14 @@
             <maxHistory>15</maxHistory>
         </rollingPolicy>
         <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
-        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
+        <!--<filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
             <webHook>${webHook}</webHook>
             <secret>${secret}</secret>
             <appName>${appname}</appName>
-        </filter>
+        </filter>-->
     </appender>
 
     <!-- 开发、测试环境 -->

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -399,4 +399,32 @@
             UPDATED_TIME=NOW()
         where id=#{agencyId}
     </update>
+
+    <select id="selectAgencyIdsByAreaCode" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT
+            ca.id
+        FROM
+            customer_agency ca
+        WHERE
+            ca.DEL_FLAG = '0'
+            AND ca.AREA_CODE = #{areaCode}
+            <if test='agencyId != "" and agencyId != null'>
+                AND ca.id !=#{agencyId}
+            </if>
+    </select>
+
+    <select id="checkAgencyName" parameterType="map" resultType="com.epmet.entity.CustomerAgencyEntity">
+        SELECT
+            ca.id
+        FROM
+            customer_agency ca
+        WHERE
+            ca.DEL_FLAG = '0'
+            AND ca.CUSTOMER_ID = #{customerId}
+            AND ca.ORGANIZATION_NAME = #{agencyName}
+            AND ca.`LEVEL` = #{level}
+            <if test='agencyId != "" and agencyId != null'>
+                AND ca.id !=#{agencyId}
+            </if>
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrgParameterDao.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.CustomerOrgParameterDao">
+
+    <select id="selectByCustomerId" parameterType="map" resultType="com.epmet.entity.CustomerOrgParameterEntity">
+        select *
+        from customer_org_parameter p
+        where p.DEL_FLAG='0'
+        and p.CUSTOMER_ID=#{customerId}
+        and p.PARAMETER_KEY=#{parameterKey}
+    </select>
+
+</mapper>