diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java index 82e4cd6..1162c80 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java @@ -202,6 +202,7 @@ public class TbTowerServiceImpl implements TbTowerService { if (!checkParam(tbTower,tbTowerVo.getUploadType())){ log.error("第{}条数据导入失败,数据为空",num); error.append(","+num); + num++; continue; } tbTowerVoList.get(i).setProId(tbTowerVo.getProId()); @@ -216,8 +217,12 @@ public class TbTowerServiceImpl implements TbTowerService { }catch (Exception e){ log.error("第{}条数据导入失败,错误信息为:{}",num,error); } - String msg =error.substring(1); - return "导入成功,第"+msg+"条数据有问题"; + if (error.length()>0){ + String msg =error.substring(1); + return "导入成功,第"+msg+"条数据有问题"; + }else { + return "导入成功"; + } }else { return "数据不能为空"; } @@ -229,7 +234,7 @@ public class TbTowerServiceImpl implements TbTowerService { if (tbTower.getLat().isEmpty() || tbTower.getLat().isEmpty() || tbTower.getTowerName().isEmpty() || tbTower.getSort()==null){ return false; } - } else if (uploadType.equals("1")) { + } else if (uploadType.equals("2")) { if (tbTower.getLat().isEmpty() || tbTower.getLat().isEmpty() || tbTower.getTowerName().isEmpty() || tbTower.getSort()==null || tbTower.getCentralMeridian().isEmpty()){ return false; }