bug修改。

src/main/java/cn/com/tenlion/systemhouse/pojo/dtos/bigdata/HouseBuilding.java

@@ -215,15 +215,9 @@ public class HouseBuilding {
         if(unit_count != null && (""+unit_count).length() > 11 ) {
             throw new ParamsException("单元数超出长度");
         }
-        if(house_count == null) {
-            throw new ParamsException("每层户数不能为空");
-        }
         if(house_count != null && (""+house_count).length() > 11 ) {
             throw new ParamsException("每层户数超出长度");
         }
-        if(floor_count == null) {
-            throw new ParamsException("楼层数不能为空");
-        }
         if(floor_count != null && (""+floor_count).length() > 11 ) {
             throw new ParamsException("楼层数超出长度");
         }
@@ -233,15 +227,9 @@ public class HouseBuilding {
         if(elevator != null && (""+elevator).length() > 11 ) {
             throw new ParamsException("电梯数超出长度");
         }
-        if(StringUtils.isEmpty(floor_count_for_unit)) {
-            throw new ParamsException("每单元层数名不能为空");
-        }
         if(floor_count_for_unit != null && floor_count_for_unit.length() > 11 ) {
             throw new ParamsException("每单元层数超出长度");
         }
-        if(StringUtils.isEmpty(house_count_for_floor)) {
-            throw new ParamsException("每层户数名不能为空");
-        }
         if(house_count_for_floor != null && house_count_for_floor.length() > 11 ) {
             throw new ParamsException("每层户数超出长度");
         }

src/main/java/cn/com/tenlion/systemhouse/service/buildinghouse/impl/BuildingHouseServiceImpl.java

@@ -252,6 +252,7 @@ public class BuildingHouseServiceImpl extends DefaultBaseService implements IBui
                 BuildingDTO buildingDTO = buildingService.get(buildingHouseDTO.getBuildingId());
                 if(null != buildingDTO) {
                     buildingHouseDTO.setGrid(buildingDTO.getGrid());
+                    buildingHouseDTO.setLocationCode(buildingDTO.getLocationCode());
                 }
             }
         }

src/main/java/cn/com/tenlion/systemhouse/service/grid/impl/GridServiceImpl.java

@@ -38,7 +38,9 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService
     @Override
     public String getLocationAll(String locationCode) {
         String locationAll = "";
+        System.out.println("locationCode = " + locationCode);
         AreaDTO areaDTO = mongoAreaService.getByCode(locationCode);
+        System.out.println("areaDTO.toString() = " + areaDTO.toString());
         Integer parentId = Integer.valueOf(areaDTO.getAreaParentId());
         String areaName = areaDTO.getAreaName();
         locationAll += areaName;

src/main/java/cn/com/tenlion/systemhouse/utils/fullsync/FullSyncC0004.java

@@ -90,10 +90,10 @@ public class FullSyncC0004 implements ApplicationEventPublisherAware {
         buildingVO.setElevator(buildingDTO.getElevator());
         buildingVO.setFloorCountForUnit(buildingDTO.getFloorCountForUnit());
         buildingVO.setHouseCountForFloor(buildingDTO.getHouseCountForFloor());
-        buildingVO.setLocationCode(buildingDTO.getLocationCode());
+        buildingVO.setLocationCode(residentialDTO.getLocationCode());
         buildingVO.setLongitude(buildingDTO.getLongitude());
         buildingVO.setLatitude(buildingDTO.getLatitude());
-        buildingVO.setGrid(buildingDTO.getGrid());
+        buildingVO.setGrid(residentialDTO.getGrid());
         return buildingVO;
     }
 

src/main/java/cn/com/tenlion/systemhouse/utils/fullsync/FullSyncC0005.java

@@ -65,6 +65,7 @@ public class FullSyncC0005 implements ApplicationEventPublisherAware {
                         BuildingHouseVO buildingHouseVO = setData(buildingHouseDTO, buildingDTO);
                         buildingHouseService.saveKafka(buildingHouseDTO.getBuildingHouseId(), buildingHouseVO, buildingDTO, residentialDTO);
                     }else {
+                        System.out.println("buildingDTO.getResidentialId() = " + buildingDTO.getResidentialId());
                         throw new SearchException("当前小区数据已不存在");
                     }
                 }else {