添加组织级别

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

@@ -54,6 +54,11 @@ public class MapOrgResultDTO implements Serializable {
      */
     private String coordinates;
 
+    /**
+     * 组织级别
+     */
+    private String agencyLevel;
+
     /**
      * 下级结果集
      */
@@ -67,5 +72,6 @@ public class MapOrgResultDTO implements Serializable {
         this.level = "";
         this.coordinates = "";
         this.children = new ArrayList<>();
+        this.agencyLevel = "";
     }
 }

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

@@ -53,6 +53,11 @@ public class MapSonOrgResultDTO implements Serializable {
      */
     private String coordinates;
 
+    /**
+     * 组织级别
+     */
+    private String agencyLevel;
+
     public MapSonOrgResultDTO() {
         this.longitudeOrigin = "";
         this.latitudeOrigin = "";
@@ -60,5 +65,6 @@ public class MapSonOrgResultDTO implements Serializable {
         this.name = "";
         this.level = "";
         this.coordinates = "";
+        this.agencyLevel = "";
     }
 }

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

@@ -561,6 +561,11 @@ public class AgencyServiceImpl implements AgencyService {
 
     /**
      * @Description 【地图配置】组织查询
+     * 根据level查询去查询不同的表，类型，组织：agency，网格：grid，小区：neighborHood
+     * 组织类型去查 customer_agency，看本级是不是 community，是，下级组织就是网格，查询customer_grid，不是，继续查customer_agency
+     * 网格类型去查 查询customer_grid，下级去查 ic_neighbor_hood，
+     * 当前组织没有经纬度的话，直接赋值根组织的经纬度，
+     * 下级组织经纬度为空的话，直接赋值上级的经纬度
      * @param formDTO
      * @param tokenDto
      * @author zxc
@@ -585,6 +590,7 @@ public class AgencyServiceImpl implements AgencyService {
             result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class);
             result.setName(entity.getOrganizationName());
             result.setLevel(formDTO.getLevel());
+            result.setAgencyLevel(entity.getLevel());
             result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude()));
             result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude()));
             if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){
@@ -622,6 +628,7 @@ public class AgencyServiceImpl implements AgencyService {
             result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class);
             result.setName(entity.getGridName());
             result.setLevel(formDTO.getLevel());
+            result.setAgencyLevel(OrgInfoConstant.GRID);
             result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude()));
             result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude()));
             List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD);

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

@@ -584,14 +584,17 @@
             <if test='type == "agency" '>
                 organization_name AS name,
                'agency' AS level,
+               LEVEL AS agencyLevel,
             </if>
             <if test='type == "grid" '>
                 grid_name AS name,
                'grid' AS level,
+               'grid' AS agencyLevel,
             </if>
             <if test='type == "neighborHood" '>
                 neighbor_hood_name AS name,
                'neighborHood' AS level,
+               'neighborHood' AS agencyLevel,
             </if>
             IFNULL(longitude,'') AS longitudeOrigin,
             IFNULL(latitude,'') AS latitudeOrigin,