Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -79,7 +79,9 @@ public enum EpmetErrorCode {
 	GUIDE_CATEGORY_NAME_EXITS(8212,"分类已存在"),
 	CUSTOMER_FORM_NOT_EXITS(8213,"客户未配置表单"),
 	RESI_NOT_FOUND(8214,"居民信息找不到"),
-
+	BUILDING_NAME_EXITED(8215,"楼栋名称已存在"),
+	DOOR_NAME_EXITED(8216,"门牌号已存在"),
+	NEIGHBOOR_NAME_EXITED(8217,"小区名称已存在"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),

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

@@ -22,40 +22,30 @@ import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 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.constant.NeighborhoodConstant;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.BuildingTreeLevelDTO;
-import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.IcBulidingFormDTO;
 import com.epmet.dto.form.IcBulidingUnitFormDTO;
-import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 import com.epmet.excel.IcBuildingExcel;
-import com.epmet.excel.IcHouseExcel;
-import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.service.BuildingService;
 import com.epmet.service.IcBuildingService;
-import com.epmet.service.IcNeighborHoodService;
 import com.epmet.service.NeighborHoodService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -207,7 +197,7 @@ public class BuildingController {
      * @return
      * @throws IOException
      */
-
+    @PostMapping("buildingunitlist")
     public Result buildingunitlist(@LoginUser TokenDto tokenDTO,@RequestBody IcBulidingUnitFormDTO icBulidingUnitFormDTO ){
         ValidatorUtils.validateEntity(icBulidingUnitFormDTO);
         List<IcBuildingUnitEntity> icBuildingUnitEntityList = icBuildingUnitDao.selectList(new QueryWrapper<IcBuildingUnitEntity>().lambda().eq(IcBuildingUnitEntity::getBuildingId, icBulidingUnitFormDTO.getBuildingId()).orderByAsc(IcBuildingUnitEntity::getUnitNum));

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

@@ -17,16 +17,13 @@
 
 package com.epmet.dao;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.entity.IcHouseEntity;
-import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.excel.IcBuildingExcel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -71,5 +68,6 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      */
     List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(@Param("neighborHoodId")String neighborHoodId);
 
+    Integer checkBuildName(@Param("neighborHoodId") String neighborHoodId,@Param("buildingName")String buildingName, @Param("buildingId")String buildingId);
     List<BuildingResultDTO> buildingListByIds(@Param("buildingIdList") List<String> buildingIdList);
 }

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

@@ -61,4 +61,9 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard);
 
+    Integer checkDoorNameUq(@Param("neighborHoodId") String neighborHoodId,
+                            @Param("buildingId")String buildingId,
+                            @Param("buildingUnitId")String buildingUnitId,
+                            @Param("doorName")String doorName,
+                            @Param("houseId")String houseId);
 }

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

@@ -17,9 +17,7 @@
 
 package com.epmet.dao;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.entity.IcNeighborHoodEntity;
@@ -29,7 +27,6 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 小区表
@@ -49,4 +46,8 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     List<IcNeighborHoodEntity> selectListByName(@Param("neighborNameList")List<String> neighborNameList,
                                                 @Param("agencyNameList") List<String> agencyNameList,
                                                 @Param("gridNameList") List<String> gridNameList);
+
+    Integer checkNameUq(@Param("customerId") String customerId,
+                        @Param("neighborHoodName")String neighborHoodName,
+                        @Param("neighborId")String neighborId);
 }

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

@@ -68,6 +68,11 @@ public class BuildingServiceImpl implements BuildingService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void AddBuilding(String customerId, IcBulidingFormDTO formDTO) {
+        //同一小区下不能存在楼栋名字一样的
+        Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null);
+        if (null != count && count > 0) {
+            throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+        }
         IcBuildingDTO icBuildingDTO= ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setCustomerId(customerId);
         IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
@@ -279,12 +284,10 @@ public class BuildingServiceImpl implements BuildingService {
         ExcelPoiUtils.exportExcel(templatePath ,map,"楼宇信息录入表",response);
         return ;
     }
-
     @Override
     public List<BuildingResultDTO> buildingListByIds(List<String> buildingIdList) {
         return icBuildingDao.buildingListByIds(buildingIdList);
     }
-
     private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {
 
 //        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
@@ -377,6 +380,12 @@ public class BuildingServiceImpl implements BuildingService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO) {
+        //同一小区下不能存在楼栋名字一样的
+        Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId());
+        if (null != count && count > 0) {
+            throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+        }
+
         IcBuildingDTO icBuilding= icBuildingService.get(formDTO.getBuildingId());
 
         if(!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())){

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

@@ -3,7 +3,8 @@ package com.epmet.service.impl;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.epmet.commons.tools.enums.HouseTypeEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dao.IcBuildingUnitDao;
@@ -63,6 +64,11 @@ public class HouseServiceImpl implements HouseService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addHouse(String customerId, IcHouseFormDTO formDTO) {
+        //同一楼栋，单元内，房屋名称唯一
+        Integer count = icHouseDao.checkDoorNameUq(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(), formDTO.getDoorName(),null);
+        if (null != count && count > 0) {
+            throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+        }
         IcHouseDTO icHouseDTO= ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
         icHouseDTO.setCustomerId(customerId);
 //        icHouseDTO.setRentFlag(formDTO.getRentFlag());
@@ -89,6 +95,11 @@ public class HouseServiceImpl implements HouseService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateHouse(String customerId, IcHouseFormDTO formDTO) {
+        //同一楼栋，单元内，房屋名称唯一
+        Integer count = icHouseDao.checkDoorNameUq(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(),formDTO.getDoorName(), formDTO.getHouseId());
+        if (null != count && count > 0) {
+            throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+        }
         IcHouseDTO icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
         icHouseDTO.setId(formDTO.getHouseId());
         icHouseDTO.setCustomerId(customerId);

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

@@ -191,21 +191,21 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         //获取居民分类数量统计
         IcResiUserDTO userDTO = new IcResiUserDTO();
         userDTO.setBuildId(formDTO.getBuildingId());
-        Result<Map<String, Map<String, Integer>>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO);
+        Result<Map<String, Map<String, String>>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO);
         if (!resultMap.success()) {
             throw new RenException(resultMap.getCode(), resultMap.getMsg());
         }
-        Map<String, Map<String, Integer>> map = resultMap.getData();
+        Map<String, Map<String, String>> map = resultMap.getData();
 
         return list.stream().map(item -> {
-            Map<String, Integer> countMap = map.get(item.getId());
+            Map<String, String> countMap = map.get(item.getId());
             HouseListResultDTO dto = new HouseListResultDTO();
             dto.setHouseId(item.getId());
             dto.setHouseName(item.getHouseName());
             List<HouseListResultDTO.CategoryListBean> categories = new ArrayList<>();
             if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) {
                 for (IcResiCategoryStatsConfigDTO category : categoryList) {
-                    if (null == countMap.get(category.getColumnName()) || countMap.get(category.getColumnName()) == NumConstant.ZERO) {
+                    if (null == countMap.get(category.getColumnName()) || NumConstant.ZERO_STR.equals(countMap.get(category.getColumnName()))) {
                         continue;
                     }
                     HouseListResultDTO.CategoryListBean bean = new HouseListResultDTO.CategoryListBean();

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

@@ -69,6 +69,11 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void AddNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO) {
+        //同一客户下，小区名称唯一
+        Integer count = icNeighborHoodDao.checkNameUq(customerId,formDTO.getNeighborHoodName(),null);
+        if (null != count && count > 0) {
+            throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+        }
         IcNeighborHoodDTO icNeighborHoodDTO = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodDTO.class);
         icNeighborHoodDTO.setCustomerId(customerId);
         Result<CustomerAgencyDTO> customerAgencyResult = govOrgOpenFeignClient.getAgencyById(icNeighborHoodDTO.getAgencyId());
@@ -153,6 +158,12 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void UpdateNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO) {
+        //同一客户下，小区名称唯一
+        Integer count = icNeighborHoodDao.checkNameUq(customerId,formDTO.getNeighborHoodName(),formDTO.getNeighborHoodId());
+        if (null != count && count > 0) {
+            throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+        }
+
         IcNeighborHoodDTO icNeighborHoodDTO = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodDTO.class);
         icNeighborHoodDTO.setId(formDTO.getNeighborHoodId());
         icNeighborHoodDTO.setCustomerId(customerId);

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

@@ -300,6 +300,16 @@
           AND b.NEIGHBOR_HOOD_ID = #{neighborHoodId}
     </select>
 
+    <select id="checkBuildName" parameterType="map" resultType="java.lang.Integer">
+        select count(*) from ic_building b
+        where b.del_flag='0'
+        AND b.NEIGHBOR_HOOD_ID = #{neighborHoodId}
+        and b.BUILDING_NAME=#{buildingName}
+        <if test=" null != buildingId and buildingId.trim() != ''">
+            and b.id !=#{buildingId}
+        </if>
+    </select>
+
     <select id="buildingListByIds" resultType="com.epmet.dto.result.BuildingResultDTO">
         select
         a.ID as buildingId,
@@ -320,5 +330,4 @@
 
     </select>
 
-
 </mapper>

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

@@ -264,4 +264,17 @@
         WHERE ih.DEL_FLAG = '0'
           AND ih.OWNER_ID_CARD = #{idCard}
     </select>
+
+    <select id="checkDoorNameUq" parameterType="map" resultType="java.lang.Integer">
+        select count(*)
+        from ic_house ih
+        where ih.del_flag='0'
+        and ih.NEIGHBOR_HOOD_ID=#{neighborHoodId}
+        and ih.BUILDING_ID=#{buildingId}
+        and ih.BUILDING_UNIT_ID=#{buildingUnitId}
+        and ih.DOOR_NAME=#{doorName}
+        <if test=" null != houseId and houseId.trim() != ''">
+            and ih.id !=#{houseId}
+        </if>
+    </select>
 </mapper>

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

@@ -200,5 +200,15 @@
     </select>
 
 
-
+    <select id="checkNameUq" parameterType="map" resultType="java.lang.Integer">
+        select
+               count(a.*)
+        from ic_neighbor_hood a
+        where a.del_flag='0'
+        and a.customer_id=#{customerId}
+        and a.NEIGHBOR_HOOD_NAME=#{neighborHoodName}
+        <if test=" null != neighborId and neighborId.trim() != ''">
+            and a.id !=#{neighborId}
+        </if>
+    </select>
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -652,5 +652,5 @@ public interface EpmetUserOpenFeignClient {
     Result<List<OptionResultDTO>> getDemandOptions();
 
     @PostMapping("/epmetuser/icresiuser/categorycount")
-    Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
+    Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -471,7 +471,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(IcResiUserDTO formDTO) {
+    public Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(IcResiUserDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHomeUserCategoryCount", formDTO);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -346,13 +346,13 @@ public class IcResiUserController {
     /**
      * @Description 获取一栋楼每个房间人员分类的数量
      * @Param formDTO
-     * @Return {@link Result< Map< String, Map< String, Integer>>>}
+     * @Return {@link Result< Map< String, Map< String, String>>>}
      * @Author zhaoqifeng
      * @Date 2021/11/5 15:10
      */
     @PostMapping("categorycount")
-    public Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) {
-        return new Result<Map<String, Map<String, Integer>>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId()));
+    public Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) {
+        return new Result<Map<String, Map<String, String>>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId()));
     }
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -123,7 +123,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
 
     @MapKey("HOME_ID")
-    Map<String, Map<String, Integer>> getHomeUserCategoryCount(@Param("buildId") String buildId);
+    Map<String, Map<String, String>> getHomeUserCategoryCount(@Param("buildId") String buildId);
 
     /**
      * @Description  根据userId查询志愿者

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -125,9 +125,9 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     /**
      * @Description 获取一栋楼每个房间人员分类的数量
      * @Param buildId
-     * @Return {@link Map< String, Map< String, Integer>>}
+     * @Return {@link Map< String, Map< String, String>>}
      * @Author zhaoqifeng
      * @Date 2021/11/5 14:40
      */
-    Map<String, Map<String, Integer>> getHomeUserCategoryCount(String buildId);
+    Map<String, Map<String, String>> getHomeUserCategoryCount(String buildId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -759,12 +759,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @param buildId
      * @Description 获取一栋楼每个房间人员分类的数量
      * @Param buildId
-     * @Return {@link Map<String,Map<String,Integer>>}
+     * @Return {@link Map<String,Map<String,String>>}
      * @Author zhaoqifeng
      * @Date 2021/11/5 14:40
      */
     @Override
-    public Map<String, Map<String, Integer>> getHomeUserCategoryCount(String buildId) {
+    public Map<String, Map<String, String>> getHomeUserCategoryCount(String buildId) {
         return baseDao.getHomeUserCategoryCount(buildId);
     }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -179,9 +179,7 @@
 
     <!-- 根据名字，组织查询人 -->
     <select id="searchByName" resultType="com.epmet.dto.result.SearchByNameResultDTO">
-        SET @curRank = #{pageNo};
         SELECT
-            @curRank := @curRank + 1 AS sort,
             ID AS userId,
             `NAME`,
             VILLAGE_ID AS neighborHoodId,