加点日志

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

@@ -194,6 +194,7 @@ public class BuildingController {
         if(resultList.size()> NumConstant.ZERO){
             Collections.sort(resultList);
             String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、"));
+            log.warn(str + "第" + subList + "行未成功！");
             return new Result().error(9999, str+"第"+subList+"行未成功！");
         }
         return new Result().ok(str);

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

@@ -163,6 +163,7 @@ public class HouseController {
         if(resultList.size()> NumConstant.ZERO){
             Collections.sort(resultList);
             String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、"));
+            log.warn(str + "第" + subList + "行未成功！");
             return new Result().error(9999, str+"第"+subList+"行未成功！");
         }
         return new Result().ok(str);

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

@@ -219,10 +219,11 @@ public class NeighborHoodController {
 //        log.info(JSON.toJSONString(result));
         List<Integer> resultList = neighborHoodService.importExcel(customerId,result,tokenDTO.getUserId(),numList);
         String str = String.format("共%s条，成功导入%s条。",numList.size()+result.size(),numList.size()+result.size()-resultList.size());
-        if(resultList.size()> NumConstant.ZERO){
+        if (resultList.size() > NumConstant.ZERO) {
             Collections.sort(resultList);
             String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、"));
-            return new Result().error(9999, str+"第"+subList+"行未成功！");
+            log.warn(str + "第" + subList + "行未成功！");
+            return new Result().error(9999, str + "第" + subList + "行未成功！");
         }
         return new Result().ok(str);
     }

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

@@ -278,7 +278,10 @@ public class BuildingServiceImpl implements BuildingService {
             //同一小区下不能存在楼栋名字一样的
             Integer count = icBuildingDao.checkBuildName(entity.getNeighborHoodId(),entity.getBuildingName(),null);
             if (null != count && count > 0) {
-                throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+                //throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+                log.error(EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+                numList.add(icBuildingExcel.getRowNum());
+                continue;
             }
             icBuildingUnitEntityList.addAll(unitList);
         }

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

@@ -187,7 +187,10 @@ public class HouseServiceImpl implements HouseService {
             //同一楼栋，单元内，房屋名称唯一
             Integer count = icHouseDao.checkDoorNameUq(entity.getNeighborHoodId(), entity.getBuildingId(), entity.getBuildingUnitId(), entity.getDoorName(),null);
             if (null != count && count > 0) {
-                throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+                //throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+                log.error(EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+                numList.add(icHouseExcel.getRowNum());
+                continue;
             }
             houseEntityList.add(entity);
         }

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

@@ -298,7 +298,10 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
             //同一客户下，小区名称唯一
             Integer count = icNeighborHoodDao.checkNameUq(customerId,icNeighborHoodExcel.getNeighborHoodName(),null);
             if (null != count && count > 0) {
-                throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
+                //throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
+                log.error(icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
+                numList.add(icNeighborHoodExcel.getRowNum());
+                continue;
             }
 
             IcNeighborHoodEntity entity = new IcNeighborHoodEntity();