| 
						
						
							
								
							
						
						
					 | 
					@ -8,7 +8,6 @@ import com.alibaba.excel.write.metadata.WriteSheet; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.alibaba.fastjson.JSON; | 
					 | 
					 | 
					import com.alibaba.fastjson.JSON; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 
					 | 
					 | 
					import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.ServiceConstant; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.StrConstant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.StrConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; | 
					 | 
					 | 
					import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.enums.HouseQrcodeEnum; | 
					 | 
					 | 
					import com.epmet.commons.tools.enums.HouseQrcodeEnum; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -35,17 +34,14 @@ import com.epmet.constants.ImportTaskConstants; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.*; | 
					 | 
					 | 
					import com.epmet.dao.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.*; | 
					 | 
					 | 
					import com.epmet.dto.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.form.*; | 
					 | 
					 | 
					import com.epmet.dto.form.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.result.*; | 
					 | 
					 | 
					import com.epmet.dto.result.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.entity.*; | 
					 | 
					 | 
					import com.epmet.entity.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.enums.*; | 
					 | 
					 | 
					import com.epmet.enums.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.feign.*; | 
					 | 
					 | 
					import com.epmet.feign.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.model.HouseInfoModel; | 
					 | 
					 | 
					import com.epmet.model.HouseInfoModel; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.model.ImportHouseInfoListener; | 
					 | 
					 | 
					import com.epmet.model.ImportHouseInfoListener; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.redis.CustomerAgencyRedis; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.redis.IcHouseRedis; | 
					 | 
					 | 
					import com.epmet.redis.IcHouseRedis; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.service.*; | 
					 | 
					 | 
					import com.epmet.service.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.stats.UserHouseStatsResultDTO; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.github.pagehelper.PageHelper; | 
					 | 
					 | 
					import com.github.pagehelper.PageHelper; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.github.pagehelper.PageInfo; | 
					 | 
					 | 
					import com.github.pagehelper.PageInfo; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.google.common.cache.Cache; | 
					 | 
					 | 
					import com.google.common.cache.Cache; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -69,7 +65,6 @@ import java.awt.image.BufferedImage; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.io.*; | 
					 | 
					 | 
					import java.io.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.net.URLEncoder; | 
					 | 
					 | 
					import java.net.URLEncoder; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.text.NumberFormat; | 
					 | 
					 | 
					import java.text.NumberFormat; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.time.LocalDate; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.*; | 
					 | 
					 | 
					import java.util.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.concurrent.ExecutorService; | 
					 | 
					 | 
					import java.util.concurrent.ExecutorService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.concurrent.TimeUnit; | 
					 | 
					 | 
					import java.util.concurrent.TimeUnit; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -137,7 +132,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Autowired | 
					 | 
					 | 
					    @Autowired | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    private DataReportOpenFeignClient dataReportOpenFeignClient; | 
					 | 
					 | 
					    private DataReportOpenFeignClient dataReportOpenFeignClient; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					    /** | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * 房屋管理-新增房屋 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param customerId | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     * @param formDTO | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Override | 
					 | 
					 | 
					    @Override | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Transactional(rollbackFor = Exception.class) | 
					 | 
					 | 
					    @Transactional(rollbackFor = Exception.class) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public void addHouse(String customerId, IcHouseAddFormDTO formDTO) { | 
					 | 
					 | 
					    public void addHouse(String customerId, IcHouseAddFormDTO formDTO) { | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -1155,6 +1155,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if (null == house) { | 
					 | 
					 | 
					        if (null == house) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息"); | 
					 | 
					 | 
					            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统,新建的一个客户id
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        if("1623486671774978060".equals(house.getCustomerId())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            return StrConstant.EPMETY_STR; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //url组成:小程序地址?房屋编码
 | 
					 | 
					 | 
					        //url组成:小程序地址?房屋编码
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(house.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode()); | 
					 | 
					 | 
					        CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(house.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if(null == codePre){ | 
					 | 
					 | 
					        if(null == codePre){ | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |