diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 5de790b..f165934 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -152,31 +152,6 @@ public class FirePointServiceImpl implements FirePointService { return duplicatedDataList != null && duplicatedDataList.size() > 0; } - /** - * 根据山东火点生成全国火点 - */ - private FirePointEntity getFirePointByShanDongFirePoint(ShanDongFirePointEntity shanDongFirePoint) { - FirePointEntity firePoint = new FirePointEntity(); - firePoint.setFireCode(shanDongFirePoint.getFireCode()); - firePoint.setCountyCode(shanDongFirePoint.getCountyCode()); - firePoint.setCountyName(shanDongFirePoint.getCountyName()); - firePoint.setSatelliteTime(shanDongFirePoint.getSatelliteTime()); - firePoint.setLongitude(shanDongFirePoint.getLongitude()); - firePoint.setLatitude(shanDongFirePoint.getLatitude()); - firePoint.setFirePointAddress(shanDongFirePoint.getFirePointAddress()); - firePoint.setSatelliteType(shanDongFirePoint.getSatelliteType()); - firePoint.setLandType(shanDongFirePoint.getLandType()); - firePoint.setConfidence(shanDongFirePoint.getConfidence()); - firePoint.setAddTime(shanDongFirePoint.getAddTime()); - firePoint.setFireType(shanDongFirePoint.getFireType()); - firePoint.setFireImage(shanDongFirePoint.getFireImage()); - firePoint.setSatelliteImage(shanDongFirePoint.getSatelliteImage()); - firePoint.setStreetCode(shanDongFirePoint.getStreetCode()); - firePoint.setStreetName(shanDongFirePoint.getStreetName()); - firePoint.setAuditFireType("0");//初始化火点为未审核状态 - return firePoint; - } - /** * 为实体类绑定地址、编号、名称 */ @@ -271,17 +246,6 @@ public class FirePointServiceImpl implements FirePointService { return firePointEntity.getSatelliteType() + "发现1个火点。\n卫星时间:" + satelliteTime + ";\nlongitude:" + formatLongitude + ";\nlatitude:" + formatLatitude + ";\ncountyName:" + countyName + ";\nstreetName:" + streetName + ";\nlandType:" + landType; } - private String getMessageContent(ShanDongFirePointEntity firePointEntity) { - java.text.DecimalFormat decimalFormat = new DecimalFormat("#.000000"); - String satelliteTime = firePointEntity.getSatelliteTime(); - String formatLongitude = decimalFormat.format(firePointEntity.getLongitude()); - String formatLatitude = decimalFormat.format(firePointEntity.getLatitude()); - String countyName = firePointEntity.getCountyName(); - String streetName = firePointEntity.getStreetName(); - String landType = firePointEntity.getLandType(); - return firePointEntity.getSatelliteType() + "发现1个待审核火点。\n卫星时间:" + satelliteTime + ";\nlongitude:" + formatLongitude + ";\nlatitude:" + formatLatitude + ";\ncountyName:" + countyName + ";\nstreetName:" + streetName + ";\nlandType:" + landType; - } - /** * 下载VIP用户火点数据 */