Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -790,15 +790,5 @@ public class RedisKeys {
 		return rootPrefix.concat("updateHouseResiNumber:").concat(customerId);
 	}
 
-	/**
-	 * desc:获取更新 房屋内有居民数量 线程的key
-	 * @param customerId
-	 * @return
-	 */
-	public static String updateIcHouseResiNumberThread(String customerId) {
-		if (StringUtils.isBlank(customerId)){
-			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误");
-		}
-		return rootPrefix.concat("updateHouseResiNumber:thread:").concat(customerId);
-	}
+
 }

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

@@ -130,5 +130,5 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	/**
 	 * 居住人数
 	 */
-	private String resiNumber;
+	private Integer resiNumber;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -12,6 +12,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -672,4 +673,12 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/house/getHomeInfoByHouseCode")
     Result<HouseInfoResultDTO> getHomeInfoByHouseCode(CommonHouseFormDTO dto);
+
+    /**
+     * desc:根据房屋id更新 屋内的居民数量
+     * @param paramList
+     * @return
+     */
+    @PostMapping("/gov/org/ichouse/updateIcHouseResiNumber")
+    Result<Integer> updateIcHouseResiNumber(List<Map<String,Object>> paramList);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -10,6 +10,7 @@ import com.epmet.dto.result.*;
 import com.epmet.feign.GovOrgOpenFeignClient;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -431,4 +432,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHomeInfoByHouseCode", dto);
     }
 
+    @Override
+    public Result<Integer> updateIcHouseResiNumber(List<Map<String, Object>> paramList) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "updateIcHouseResiNumber", paramList);
+    }
+
 }

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

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -94,4 +95,14 @@ public class IcHouseController {
     public Result<IcHouseDTO> getByHouseCode(@PathVariable("houseCode") String houseCode){
         return new Result<IcHouseDTO>().ok(icHouseService.getByHouseCode(houseCode));
     }
+
+    /**
+     * desc:更新房屋的屋内居民数
+     * @param paramList houseId:'123',resiNumber:20
+     * @return
+     */
+    @PostMapping("updateIcHouseResiNumber")
+    public Result<Integer> updateIcHouseResiNumber(@RequestBody List<Map<String,Object>> paramList){
+        return new Result<Integer>().ok(icHouseService.updateIcHouseResiNumber(paramList));
+    }
 }

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

@@ -30,4 +30,6 @@ public interface IcEnterpriseDao extends BaseDao<IcEnterpriseEntity> {
      * @return
      */
     List<EnterpriseDetailDTO> selectList(EnterprisePageFormDTO formDTO);
+
+    List<IcEnterpriseEntity> selectForUniqueName(@Param("gridId") String gridId, @Param("placeOrgName") String placeOrgName, @Param("enterpriseId") String enterpriseId);
 }

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -147,29 +148,38 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<CreateHouseCodeAndUrlDTO> selectBatchHouseCodeAndUrl(@Param("customerId") String customerId);
 
     /**
-    * @describe: 通过客户id查询
-    * @author wangtong
-    * @date 2022/6/7 18:36
-    * @params [customerId]
-    * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO
-    */
+     * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO
+     * @describe: 通过客户id查询
+     * @author wangtong
+     * @date 2022/6/7 18:36
+     * @params [customerId]
+     */
     CustomerOrgParameterEntity selectByCustomerId(@Param("customerId") String customerId, @Param("preKey") String preKey);
 
     /**
-    * @describe: 工作端-通过房屋编码获取房屋信息
-    * @author wangtong
-    * @date 2022/6/9 15:23
-    * @params [houseCode]
-    * @return com.epmet.dto.result.HouseInfoResultDTO
-    */
+     * @return com.epmet.dto.result.HouseInfoResultDTO
+     * @describe: 工作端-通过房屋编码获取房屋信息
+     * @author wangtong
+     * @date 2022/6/9 15:23
+     * @params [houseCode]
+     */
     HouseInfoResultDTO selectHomeInfoByHouseCode(@Param("houseCode") String houseCode);
 
     /**
-    * @describe: 根据筛选获取需要下载的一户一码信息
-    * @author wangtong
-    * @date 2022/6/13 16:34
-    * @params [formDTO]
-    * @return java.util.List<com.epmet.dto.result.IcHouseListResultDTO>
-    */
+     * @return java.util.List<com.epmet.dto.result.IcHouseListResultDTO>
+     * @describe: 根据筛选获取需要下载的一户一码信息
+     * @author wangtong
+     * @date 2022/6/13 16:34
+     * @params [formDTO]
+     */
     List<IcHouseListResultDTO> searchHouseZipList(IcHouseListFormDTO formDTO);
+
+    /**
+     * desc:更新房屋的屋内居民数
+     *
+     * @param paramList houseId:'123',resiNumber:20
+     * @return
+     */
+    Integer updateIcHouseResiNumber(@Param("paramList") List<Map<String, Object>> paramList);
+
 }

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

@@ -131,5 +131,5 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	/**
 	 * 居住人数
 	 */
-	private String resiNumber;
+	private Integer resiNumber;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java

@@ -2,6 +2,7 @@ package com.epmet.excel.handler;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -13,6 +14,7 @@ import com.epmet.entity.IcEnterpriseEntity;
 import com.epmet.excel.EnterpriseImportExcelDTO;
 import com.epmet.service.impl.IcEnterpriseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,9 +33,9 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
     private Map<String, String> placeTypeMap;
     private Map<String, String> scaleMap;
     private Map<String,String> gridMap;
-    //数据
-    private List<IcEnterpriseEntity> datas = new ArrayList<>();
-
+    //要插入的数据
+    private List<IcEnterpriseEntity> insertDatas = new ArrayList<>();
+    private List<IcEnterpriseEntity> updateDatas = new ArrayList<>();
     //错误项列表
     private List<EnterpriseImportExcelDTO.ErrorRow> errorRows = new ArrayList<>();
 
@@ -84,10 +86,25 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             enterpriseEntity.setLatitude(StrConstant.EPMETY_STR);
             //规模
             enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
-            enterpriseEntity.setSourceType("import");
-            datas.add(enterpriseEntity);
 
-            if (datas.size() == MAX_THRESHOLD) {
+
+            //网格id+场所名称
+            List<IcEnterpriseEntity> originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null);
+            if(CollectionUtils.isEmpty(originList)){
+                enterpriseEntity.setSourceType("import");
+                insertDatas.add(enterpriseEntity);
+            }else{
+                IcEnterpriseEntity origin=originList.get(NumConstant.ZERO);
+                enterpriseEntity.setId(origin.getId());
+                enterpriseEntity.setSourceType(origin.getSourceType());
+                updateDatas.add(enterpriseEntity);
+            }
+
+
+            if (insertDatas.size() == MAX_THRESHOLD) {
+                execPersist();
+            }
+            if (updateDatas.size() == MAX_THRESHOLD) {
                 execPersist();
             }
         } catch (Exception e) {
@@ -122,9 +139,10 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
      */
     private void execPersist() {
         try {
-            icEnterpriseServiceImpl.insertBatch(datas);
+            icEnterpriseServiceImpl.insertBatch(insertDatas);
+            icEnterpriseServiceImpl.updateBatchById(updateDatas);
         } finally {
-            datas.clear();
+            insertDatas.clear();
         }
     }
 

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

@@ -11,6 +11,7 @@ import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 房屋信息
@@ -100,4 +101,11 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @return
      */
     String getFullName(String neighborHoodId, String buildingId, String unitId, String doorName);
+
+    /**
+     * desc:更新房屋的屋内居民数
+     * @param paramList houseId:'123',resiNumber:20
+     * @return
+     */
+    Integer updateIcHouseResiNumber(List<Map<String, Object>> paramList);
 }

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

@@ -1100,8 +1100,18 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
             houses2Dispose.stream().forEach(h -> {
                 IcNeighborHoodDTO neighborhood = neighborHoodService.get(h.getNeighborHoodId());
+                if (neighborhood == null) {
+                    log.warn("为house初始化orgIdPath失败，指定ID的小区未找到。小区id:{}, 房屋id:{}", h.getNeighborHoodId(), h.getId());
+                    return;
+                }
                 ArrayList<String> pidList = new ArrayList<>();
-                recureAppendParentAgencyId(neighborhood.getAgencyId(), pidList);
+                try {
+                    recureAppendParentAgencyId(neighborhood.getAgencyId(), pidList);
+                } catch (Exception e) {
+                    String errorMsg = ExceptionUtils.getErrorStackTrace(e);
+                    log.warn(errorMsg);
+                    return;
+                }
                 String orgIdPath = String.join(":", pidList);
 
                 // 更新
@@ -1122,6 +1132,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     private void recureAppendParentAgencyId(String agencyId, List result) {
         result.add(0, agencyId);
         CustomerAgencyEntity agency = customerAgencyDao.selectById(agencyId);
+        if (agency == null) {
+            throw new EpmetException(String.format("为house初始化orgIdPath失败，agency为号到。agencyId:%s", agencyId));
+        }
         String pid = agency.getPid();
         if (StringUtils.isBlank(pid) || "0".equals(pid)) {
             return;

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

@@ -100,6 +100,10 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String addOrUpdate(EnterpriseFormDTO formDTO) {
+        //同一网格内，名称唯一
+        if (CollectionUtils.isNotEmpty(selectForUniqueName(formDTO.getGridId(), formDTO.getPlaceOrgName(), formDTO.getEnterpriseId()))) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一网格内存在相同名称的场所", "场所已存在");
+        }
         AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId());
         if (null == agencyInfoCache) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"组织信息查询异常","组织信息查询异常");
@@ -404,5 +408,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
         return staffInfo;
     }
 
-
+    public List<IcEnterpriseEntity> selectForUniqueName(String gridId, String placeOrgName, String enterpriseId) {
+        return  baseDao.selectForUniqueName(gridId, placeOrgName, enterpriseId);
+    }
 }

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

@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -274,4 +275,29 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         String unitName = Optional.ofNullable(unit).map(u -> u.getUnitNum().concat("单元")).orElse("");
         return new StringBuilder().append(neighborhoodName).append(buildingName).append(unitName).append(doorName).toString();
     }
+
+    @Override
+    public Integer updateIcHouseResiNumber(List<Map<String, Object>> paramList) {
+        if (CollectionUtils.isEmpty(paramList)){
+            log.warn("updateIcHouseResiNumber param is empty");
+            return 0;
+        }
+        IcHouseEntity entity = new IcHouseEntity();
+
+        AtomicInteger effects = new AtomicInteger(0);
+        paramList.forEach(o->{
+            Object houseId = o.get("houseId");
+            Object resiNumber = o.get("resiNumber");
+            if (houseId == null || resiNumber == null){
+                return;
+            }
+            entity.setId(houseId.toString());
+
+            entity.setResiNumber((int)resiNumber);
+            int i = baseDao.updateById(entity);
+            effects.incrementAndGet();
+        });
+        return effects.get();
+       // return baseDao.updateIcHouseResiNumber(paramList);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.28__houseResiNumberAdjust.sql

@@ -0,0 +1 @@
+alter table ic_house modify RESI_NUMBER int(2) default 0;

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

@@ -91,4 +91,16 @@
             </if>
             order by ie.CREATED_TIME desc
     </select>
+
+    <select id="selectForUniqueName" parameterType="map" resultType="com.epmet.entity.IcEnterpriseEntity">
+        select
+            ie.*
+        from ic_enterprise ie
+        where ie.DEL_FLAG = '0'
+        and ie.GRID_ID = #{gridId}
+        and ie.PLACE_ORG_NAME = #{placeOrgName}
+        <if test='null != enterpriseId and "" != enterpriseId'>
+            and ie.id != #{enterpriseId}
+        </if>
+    </select>
 </mapper>

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

@@ -24,6 +24,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="resiNumber" column="RESI_NUMBER"/>
     </resultMap>
 
     <!-- 批量更新房屋信息 -->
@@ -521,5 +522,10 @@
             <foreach collection="unitIds" item="id" separator=",">#{id}</foreach>
             )
     </select>
+    <update id="updateIcHouseResiNumber">
+        <foreach collection="paramList" separator=";" item="item" >
+            UPDATE ic_house SET RESI_NUMBER = #{item.resiNumber} where ID = #{item.houseId} and DEL_FLAG = '0'
+        </foreach>
+    </update>
 
 </mapper>

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

@@ -376,5 +376,5 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @param customerId
      * @return
      */
-    List<HouseIcResiUserCountResultDTO> getResiUserCountGroupHomeId(@Param("customerId") String customerId);
+    List<Map<String, Object>> getResiUserCountGroupHomeId(@Param("customerId") String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
@@ -69,7 +71,7 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
         log.info("obj is {}", JSON.toJSONString(obj));
         try {
             if (!resiWarnStats(obj)||!updateIcNatResiFlag(tags, obj)||!updateIcHouseResiNumber(obj)){
-
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败,等待重新消费");
             }
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试

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

@@ -19,12 +19,12 @@ package com.epmet.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.bean.ResiExportBaseInfoData;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
-import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
@@ -60,7 +60,10 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.support.ExportResiUserItemDTO;
-import com.epmet.feign.*;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.*;
 import com.github.pagehelper.Page;
@@ -109,8 +112,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Autowired
     private EpmetHeartOpenFeignClient heartOpenFeignClient;
     @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
-    @Autowired
     private IcResiUserAttachmentService icResiUserAttachmentService;
     @Autowired
     private IcResiUserImportServiceImpl icResiUserImportService;
@@ -121,8 +122,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Autowired
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
     @Autowired
-    private GovOrgFeignClient govOrgFeignClient;
-    @Autowired
     private IcResiUserDao icResiUserDao;
     @Autowired
     private IcUserChangeRecordService icUserChangeRecordService;
@@ -146,8 +145,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
     @Resource
     private UserBaseInfoDao userBaseInfoDao;
-    @Autowired
-    private DistributedLock distributedLock;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -2583,37 +2580,27 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public void updateIcHouseResiNumber(String customerId) {
-        String threadKey = RedisKeys.updateIcHouseResiNumberThread(customerId);
-        /*RLock lock = distributedLock.getLock(threadKey);
-        if (lock!= null && lock.isLocked()){
-            Future<Integer> o = (Future<Integer>) redisUtils.get(threadKey);
-            if (o != null){
-                //如果是自己的 则取消就行了
-                //o.cancel(true);
-                log.info("updateIcHouseResiNumber 任务取消");
-            }
-        }*/
 
         Future submit = executorService.submit(() -> {
             int pageNo = 1;
             int pageSize = NumConstant.TEN_THOUSAND;
-            Page<HouseIcResiUserCountResultDTO> houseReisCountListPage = null;
+            Page<Map<String, Object>> houseReisCountListPage = null;
             String key = RedisKeys.getUpdateHouseResiNumer(customerId);
             redisUtils.delete(key);
             do {
                 houseReisCountListPage = PageHelper.startPage(pageNo++, pageSize, false)
                         .doSelectPage(() -> baseDao.getResiUserCountGroupHomeId(customerId));
                 System.out.println(houseReisCountListPage.getResult().size());
-                List<HouseIcResiUserCountResultDTO> result = houseReisCountListPage.getResult();
-                for (HouseIcResiUserCountResultDTO o: result){
-                    redisUtils.leftPush(key,o);
-                }
+                List<Map<String, Object>> result = houseReisCountListPage.getResult();
+                Result<Integer> effectRowResult =  govOrgOpenFeignClient.updateIcHouseResiNumber(result);
+               if (effectRowResult == null || !effectRowResult.success()){
+                   throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"调用org服务失败");
+               }
+               log.debug("updateIcHouseResiNumber org effectRowResult:{}",JSON.toJSONString(effectRowResult));
 
             } while (houseReisCountListPage.getResult().size() == pageSize);
             log.info("updateIcHouseResiNumber 执行完毕");
-            //distributedLock.unLock(lock);
         });
-        redisUtils.set(threadKey,submit);
     }
 
     /**

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

@@ -1132,7 +1132,7 @@
             AND customer_id = #{customerId}
             AND DEL_FLAG = '0'
     </select>
-    <select id="getResiUserCountGroupHomeId" resultType="com.epmet.dto.result.HouseIcResiUserCountResultDTO">
-        select HOME_ID,count(1) resiNumber from ic_resi_user WHERE CUSTOMER_ID = #{customerId} and DEL_FLAG = '0'  AND `status` = '0' group by HOME_ID
+    <select id="getResiUserCountGroupHomeId" resultType="java.util.Map">
+        select HOME_ID houseId,count(1) resiNumber from ic_resi_user WHERE CUSTOMER_ID = #{customerId} and DEL_FLAG = '0'  AND `status` = '0' group by HOME_ID
     </select>
 </mapper>