diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 4149ca6..566123b 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -159,29 +159,7 @@ public class FirePointServiceImpl implements FirePointService { */ private boolean checkDuplicatedData(FirePointEntity firePointEntity) { List duplicatedDataList = firePointDao.findDuplicatedData(firePointEntity.getLongitude(), firePointEntity.getLatitude(), firePointEntity.getStreetCode(), firePointEntity.getSatelliteTime(), firePointEntity.getSatelliteType(), firePointEntity.getLandType()); - return duplicatedDataList != null && duplicatedDataList.size() > 1; - } - - /** - * 检查重复数据 - * - * @param shanDongFirePoint 待入库实体类 - * @return true-是重复数据,拒绝入库;false-不是重复数据,可以入库 - */ - private boolean checkDuplicatedDataX(ShanDongFirePointEntity shanDongFirePoint) { - List duplicatedDataList = firePointDao.findDuplicatedData(shanDongFirePoint.getLongitude(), shanDongFirePoint.getLatitude(), shanDongFirePoint.getStreetCode(), shanDongFirePoint.getSatelliteTime(), shanDongFirePoint.getSatelliteType(), shanDongFirePoint.getLandType()); - return duplicatedDataList != null && duplicatedDataList.size() > 1; - } - - /** - * 检查重复数据 - * - * @param shanDongFirePoint 待入库实体类 - * @return true-是重复数据,拒绝入库;false-不是重复数据,可以入库 - */ - private boolean checkDuplicatedData(ShanDongFirePointEntity shanDongFirePoint) { - List duplicatedDataList = shanDongFirePointDao.findDuplicatedData(shanDongFirePoint.getLongitude(), shanDongFirePoint.getLatitude(), shanDongFirePoint.getStreetCode(), shanDongFirePoint.getSatelliteTime(), shanDongFirePoint.getSatelliteType(), shanDongFirePoint.getLandType()); - return duplicatedDataList != null && duplicatedDataList.size() > 1; + return duplicatedDataList != null && duplicatedDataList.size() > 0; } /**