someupdate

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

@@ -150,6 +150,20 @@ public class IcNeighborHoodController {
         return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId()));
     }
 
+    /**
+     * 获取用户组织下小区列表
+     *
+     * @param tokenDto
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>>
+     * @author zhy
+     * @date 2022/8/19 13:32
+     */
+    @PostMapping("neighborhoodlist")
+    public Result<List<OptionResultDTO>> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
+        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto));
+    }
+
     /**
      * @Description  小区信息导入
      * @param tokenDTO

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

@@ -20,6 +20,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;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
@@ -30,6 +31,7 @@ import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.entity.IcNeighborHoodPropertyEntity;
 import com.epmet.entity.IcPropertyManagementEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -115,6 +117,17 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      */
     List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId);
 
+    /**
+     * 获取用户组织下小区列表
+     *
+     * @param tokenDto
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>>
+     * @author zhy
+     * @date 2022/8/19 13:32
+     */
+    List<OptionResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto);
+
     /**
      * @Description 通过ID查询小区信息
      * @Param ids

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

@@ -40,6 +40,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
@@ -210,6 +211,32 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         }).collect(Collectors.toList());
     }
 
+    public List<OptionResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
+        if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) {
+            log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
+            CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == result || StringUtils.isBlank(result.getAgencyId())) {
+                log.error(String.format("staffId:%s,工作人员缓存信息查询异常"));
+                return Collections.emptyList();
+            }
+            dto.setAgencyId(result.getAgencyId());
+        }
+        LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()),IcNeighborHoodEntity::getAgencyId, dto.getAgencyId());
+        wrapper.eq(StringUtils.isNotBlank(dto.getGridId()), IcNeighborHoodEntity::getGridId, dto.getGridId());
+        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 result = new OptionResultDTO();
+            result.setValue(item.getId());
+            result.setLabel(item.getNeighborHoodName());
+            return result;
+        }).collect(Collectors.toList());
+    }
+
     /**
      * @param ids
      * @Description 通过ID查询小区信息