Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -486,6 +486,16 @@ public class CoverageServiceImpl implements CoverageService {
             result.setTotal(Long.valueOf(String.valueOf(allIcUser.size())));
             result.setList(allIcUser);
         }
+        if (CollectionUtils.isNotEmpty(result.getList())){
+            result.getList().forEach(r -> {
+                HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), r.getHomeId());
+                if (null == houseInfo){
+                    throw new EpmetException("获取房屋信息失败："+r.getHomeId());
+                }
+                r.setLongitude(houseInfo.getBuildingLongitude());
+                r.setLatitude(houseInfo.getBuildingLatitude());
+            });
+        }
         return result;
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -167,6 +167,7 @@
             ifnull(u.RHZK,'') as rhzk
         FROM ic_resi_user u
         WHERE u.DEL_FLAG = '0'
+          and u.status ='0'
           <if test='customerId != null and customerId != ""'>
               AND u.CUSTOMER_ID = #{customerId}
           </if>