Merge branches 'dev_ic_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java

@@ -122,7 +122,7 @@ public class IcLoinController implements ResultDataResolver {
     public Result<UserTokenResultDTO> login(@RequestBody LoginByPassWordFormDTO input) {
         ValidatorUtils.validateEntity(input, LoginByPassWordFormDTO.IcLoginGroup.class);
         String ticket = input.getTicket();
-        String orgId = input.getOrgId();
+        String orgId = input.getRootAgencyId();
         String staffId = input.getStaffId();
 
         // ticket校验

epmet-auth/src/main/java/com/epmet/dto/form/LoginByPassWordFormDTO.java

@@ -56,7 +56,7 @@ public class LoginByPassWordFormDTO extends LoginCommonFormDTO implements Serial
 	 * 所选的要登录的组织id
 	 */
 	@NotBlank(message = "要登录的orgId不能为空", groups = { IcLoginGroup.class })
-	private String orgId;
+	private String rootAgencyId;
 
 	/**
 	 * 工作人员id

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/26 13:53
+ */
+@Data
+public class OptionResultDTO implements Serializable {
+    private static final long serialVersionUID = 8618231166600518980L;
+    private String label;
+    private String value;
+    private List<OptionResultDTO> children;
+}

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

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -16,5 +17,6 @@ public class AgencyIdFormDTO implements Serializable {
     /**
      * 部门Id
      */
+    @NotBlank(message = "组织机构ID不能为空")
     private String agencyId;
 }

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

@@ -0,0 +1,17 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/25 17:03
+ */
+@Data
+public class HouseFormDTO implements Serializable {
+    private static final long serialVersionUID = 2636608477324780974L;
+    private String buildingId;
+    private String unitId;
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/25 15:03
+ */
+@Data
+public class BuildingDTO implements Serializable {
+    private static final long serialVersionUID = -2129418426919785999L;
+    private String buildingId;
+    private String buildingName;
+    private List<UnitDTO> unitList;
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/25 15:08
+ */
+@Data
+public class GridTreeResultDTO implements Serializable {
+    private static final long serialVersionUID = -6506457371074529990L;
+    private String gridId;
+    private String gridName;
+    private List<NeighborHoodDTO> neighborHoodList;
+}

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

@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/25 16:58
+ */
+@Data
+public class HouseResultDTO implements Serializable {
+    private static final long serialVersionUID = 8054109017922254586L;
+    private String houseId;
+    private String houseName;
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/25 15:06
+ */
+@Data
+public class NeighborHoodDTO implements Serializable {
+    private static final long serialVersionUID = 1644088283259175745L;
+    private String neighborHoodId;
+    private String neighborHoodName;
+    private List<BuildingDTO> buildingList;
+}

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

@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/25 15:04
+ */
+@Data
+public class UnitDTO implements Serializable {
+    private static final long serialVersionUID = -919268879670510057L;
+    private String unitId;
+    private String unitName;
+}

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

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -286,4 +287,17 @@ public class CustomerGridController {
         return new Result<List<String>>().ok(customerGridService.selectOrgsByUserId(userId));
     }
 
+    /**
+     * @Description 获取组织下网格选项
+     * @Param formDTO
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:02
+     */
+    @PostMapping("gridoption")
+    public Result<List<OptionResultDTO>> getGridOption(@RequestBody AgencyIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionResultDTO>>().ok(customerGridService.getGridOption(formDTO.getAgencyId()));
+    }
+
 }

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

@@ -184,4 +184,10 @@ public class GridController {
         CustomerGridDTO gridInfo = customerGridService.getBaseInfo(customerGridFormDTO);
         return new Result<CustomerGridDTO>().ok(gridInfo);
     }
+
+    @PostMapping("gridtree")
+    public Result<List<GridTreeResultDTO>> getGridTree(@RequestBody AgencyIdFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<GridTreeResultDTO>>().ok(customerGridService.getGridTree(formDTO));
+    }
 }

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

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -29,6 +30,7 @@ import com.epmet.service.IcBuildingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -81,5 +83,15 @@ public class IcBuildingController {
         return new Result();
     }
 
-
+    /**
+     * @Description 获取小区内的楼栋
+     * @Param dto
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:46
+     */
+    @PostMapping("buildingoption")
+    public Result<List<OptionResultDTO>> getBuildingOptions(IcBuildingDTO dto) {
+        return new Result<List<OptionResultDTO>>().ok(icBuildingService.getBuildingOptions(dto.getNeighborHoodId()));
+    }
 }

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

@@ -17,20 +17,19 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.service.IcBuildingUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -83,5 +82,15 @@ public class IcBuildingUnitController {
         icBuildingUnitService.delete(ids);
         return new Result();
     }
-
+    /**
+     * @Description 获取楼栋内单元
+     * @Param dto
+     * @Return {@link Result<List<OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:46
+     */
+    @PostMapping("unitoption")
+    public Result<List<OptionResultDTO>> getUnitOptions(IcBuildingUnitDTO dto) {
+        return new Result<List<OptionResultDTO>>().ok(icBuildingUnitService.getUnitOptions(dto.getBuildingId()));
+    }
 }

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

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -25,10 +26,12 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.service.IcHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -80,6 +83,9 @@ public class IcHouseController {
         icHouseService.delete(ids);
         return new Result();
     }
-
+    @PostMapping("houseoption")
+    public Result<List<OptionResultDTO>> getHouseOption(@RequestBody HouseFormDTO formDTO){
+        return new Result<List<OptionResultDTO>>().ok(icHouseService.getHouseOption(formDTO));
+    }
 
 }

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

@@ -17,20 +17,19 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.service.IcNeighborHoodService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -84,4 +83,16 @@ public class IcNeighborHoodController {
         return new Result();
     }
 
+    /**
+     * @Description 获取网格下小区列表
+     * @Param dto
+     * @Return {@link Result< List< OptionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:38
+     */
+    @PostMapping("neighborhoodoption")
+    public Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto) {
+        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getGridId()));
+    }
+
 }

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

@@ -300,4 +300,40 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/8/5 10:08 上午
      */
     List<String> selectOrgsByUserId(@Param("userId") String userId);
+
+    /**
+     * @Description 查询组织下的网格及网格下的小区、单元、楼栋
+     * @Param agencyId
+     * @Return {@link List< GridTreeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 15:19
+     */
+    List<GridTreeResultDTO> selectGridTree(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 网格下小区列表
+     * @Param gridId
+     * @Return {@link List< NeighborHoodDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 16:04
+     */
+    List<NeighborHoodDTO> selectNeighborHoodList(@Param("gridId") String gridId);
+
+    /**
+     * @Description 小区下楼栋列表
+     * @Param neighborHoodId
+     * @Return {@link List< BuildingDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 16:04
+     */
+    List<BuildingDTO> selectBuildingList(@Param("neighborHoodId") String neighborHoodId);
+
+    /**
+     * @Description 楼栋下单元列表
+     * @Param buildingId
+     * @Return {@link List< UnitDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 16:04
+     */
+    List<UnitDTO> selectUnitList(@Param("buildingId") String buildingId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -319,4 +320,22 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/8/5 10:08 上午
      */
     List<String> selectOrgsByUserId(String userId);
+
+    /**
+     * @Description 获取组织下网格树
+     * @Param formDTO
+     * @Return {@link List<GridTreeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 16:28
+     */
+    List<GridTreeResultDTO> getGridTree(AgencyIdFormDTO formDTO);
+
+    /**
+     * @Description 获取组织下网格选项
+     * @Param agencyId
+     * @Return {@link List< OptionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:01
+     */
+    List<OptionResultDTO> getGridOption(String agencyId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.entity.IcBuildingEntity;
@@ -92,4 +93,13 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
      * @date 2021-10-25
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取小区内的楼栋
+     * @Param neighborHoodId
+     * @Return {@link List< OptionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:43
+     */
+    List<OptionResultDTO> getBuildingOptions(String neighborHoodId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
@@ -92,4 +93,13 @@ public interface IcBuildingUnitService extends BaseService<IcBuildingUnitEntity>
      * @date 2021-10-25
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取楼栋内单元
+     * @Param buildingId
+     * @Return {@link List<OptionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:49
+     */
+    List<OptionResultDTO> getUnitOptions(String buildingId);
 }

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

@@ -18,8 +18,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.entity.IcHouseEntity;
 
 import java.util.List;
@@ -92,4 +94,13 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @date 2021-10-25
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取楼栋房屋列表
+     * @Param formDTO
+     * @Return {@link List<HouseFormDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 17:04
+     */
+    List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
@@ -92,4 +93,13 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @date 2021-10-25
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取网格下小区列表
+     * @Param gridId
+     * @Return {@link List<OptionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:32
+     */
+    List<OptionResultDTO> getNeighborHoodOptions(String gridId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,6 +26,7 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 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.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -50,6 +52,7 @@ import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerGridService;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -818,4 +821,42 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public List<String> selectOrgsByUserId(String userId) {
         return baseDao.selectOrgsByUserId(userId);
     }
+
+    /**
+     * @param formDTO
+     * @Description 获取组织下网格树
+     * @Param formDTO
+     * @Return {@link List<GridTreeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 16:28
+     */
+    @Override
+    public List<GridTreeResultDTO> getGridTree(AgencyIdFormDTO formDTO) {
+        return baseDao.selectGridTree(formDTO.getAgencyId());
+    }
+
+    /**
+     * @param agencyId
+     * @Description 获取组织下网格选项
+     * @Param agencyId
+     * @Return {@link List<  OptionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:01
+     */
+    @Override
+    public List<OptionResultDTO> getGridOption(String agencyId) {
+        LambdaQueryWrapper<CustomerGridEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CustomerGridEntity::getPid, agencyId);
+        wrapper.last("ORDER BY CONVERT ( GRID_NAME USING gbk ) ASC");
+        List<CustomerGridEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionResultDTO dto = new OptionResultDTO();
+            dto.setLabel(item.getGridName());
+            dto.setValue(item.getId());
+            return dto;
+        }).collect(Collectors.toList());
+    }
 }

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

@@ -17,24 +17,28 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.service.IcBuildingService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 楼栋信息
@@ -98,4 +102,32 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param neighborHoodId
+     * @Description 获取小区内的楼栋
+     * @Param neighborHoodId
+     * @Return {@link List<  OptionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:43
+     */
+    @Override
+    public List<OptionResultDTO> getBuildingOptions(String neighborHoodId) {
+        if (StringUtils.isBlank(neighborHoodId)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId);
+        wrapper.last("ORDER BY CONVERT ( BUILDING_NAME USING gbk ) ASC");
+        List<IcBuildingEntity> list = baseDao.selectList(wrapper);
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionResultDTO dto = new OptionResultDTO();
+            dto.setValue(item.getId());
+            dto.setLabel(item.getBuildingName());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

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

@@ -17,24 +17,28 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 import com.epmet.service.IcBuildingUnitService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 楼栋单元信息
@@ -98,4 +102,32 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param buildingId
+     * @Description 获取楼栋内单元
+     * @Param buildingId
+     * @Return {@link List<OptionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:49
+     */
+    @Override
+    public List<OptionResultDTO> getUnitOptions(String buildingId) {
+        if (StringUtils.isBlank(buildingId)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcBuildingUnitEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcBuildingUnitEntity::getBuildingId, buildingId);
+        wrapper.last("ORDER BY CONVERT ( UNIT_NAME USING gbk ) ASC");
+        List<IcBuildingUnitEntity> list = baseDao.selectList(wrapper);
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionResultDTO dto = new OptionResultDTO();
+            dto.setValue(item.getId());
+            dto.setLabel(item.getUnitName());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

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

@@ -17,23 +17,29 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcHouseDao;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.service.IcHouseService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 房屋信息
@@ -97,4 +103,33 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @Description 获取楼栋房屋列表
+     * @Param formDTO
+     * @Return {@link List<HouseFormDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/25 17:04
+     */
+    @Override
+    public List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getBuildingId()) && StringUtils.isBlank(formDTO.getUnitId())) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
+        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
+        List<IcHouseEntity> list = baseDao.selectList(wrapper);
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionResultDTO dto = new OptionResultDTO();
+            dto.setValue(item.getId());
+            dto.setLabel(item.getHouseName());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

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

@@ -17,24 +17,28 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcNeighborHoodDao;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.service.IcNeighborHoodService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 小区表
@@ -98,4 +102,32 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param gridId
+     * @Description 获取网格下小区列表
+     * @Param gridId
+     * @Return {@link List<  OptionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/10/26 14:32
+     */
+    @Override
+    public List<OptionResultDTO> getNeighborHoodOptions(String gridId) {
+        if (StringUtils.isBlank(gridId)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcNeighborHoodEntity::getGridId, gridId);
+        wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
+        List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionResultDTO dto = new OptionResultDTO();
+            dto.setValue(item.getId());
+            dto.setLabel(item.getNeighborHoodName());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

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

@@ -618,4 +618,67 @@
         union ALL
         SELECT agency_id AS orgId  FROM customer_staff_agency WHERE del_flag = '0' and USER_ID = #{userId}
     </select>
+
+    <resultMap id="GridTreeResult" type="com.epmet.dto.result.GridTreeResultDTO">
+        <result column="gridId"  property="gridId"/>
+        <result column="gridName" property="gridName"/>
+        <collection property="neighborHoodList" ofType="com.epmet.dto.result.NeighborHoodDTO"
+                    select="selectNeighborHoodList" column="gridId">
+        </collection>
+    </resultMap>
+    <select id="selectGridTree" resultMap="GridTreeResult">
+        select
+            id as gridId,
+            grid_name as  gridName
+        from
+            customer_grid
+        where del_flag = '0'
+        and PID = #{agencyId}
+    </select>
+
+    <resultMap id="NeighborHoodResult" type="com.epmet.dto.result.NeighborHoodDTO">
+        <result column="neighborHoodId"  property="neighborHoodId"/>
+        <result column="neighborHoodName" property="neighborHoodName"/>
+        <collection property="buildingList" ofType="com.epmet.dto.result.BuildingDTO"
+                    select="selectBuildingList" column="neighborHoodId">
+        </collection>
+    </resultMap>
+    <select id="selectNeighborHoodList" resultMap="NeighborHoodResult">
+        SELECT
+            ID AS neighborHoodId,
+            NEIGHBOR_HOOD_NAME AS neighborHoodName
+        FROM
+            ic_neighbor_hood
+        WHERE
+            DEL_FLAG = '0'
+            AND GRID_ID = #{gridId}
+    </select>
+    <resultMap id="BuildingResult" type="com.epmet.dto.result.BuildingDTO">
+        <result column="buildingId"  property="buildingId"/>
+        <result column="buildingName" property="buildingName"/>
+        <collection property="unitList" ofType="com.epmet.dto.result.UnitDTO"
+                    select="selectUnitList" column="buildingId">
+        </collection>
+    </resultMap>
+    <select id="selectBuildingList" resultMap="BuildingResult">
+        SELECT
+            ID AS buildingId,
+            BUILDING_NAME AS buildingName
+        FROM
+            ic_building
+        WHERE
+            DEL_FLAG = '0'
+            AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
+    </select>
+    <select id="selectUnitList" resultType="com.epmet.dto.result.UnitDTO">
+        SELECT
+            ID AS unitId,
+            UNIT_NAME AS unitName
+        FROM
+            ic_building_unit
+        WHERE
+            DEL_FLAG = '0'
+            AND BUILDING_ID = #{buildingId}
+    </select>
+
 </mapper>