From 156207f709cea9ee147cd5719303fcc83c428e9b Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Mon, 30 Jan 2023 17:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FirePointServiceImpl.java    | 34 ++-----------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
index 387af11..7a9575c 100644
--- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
+++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
@@ -184,31 +184,6 @@ public class FirePointServiceImpl implements FirePointService {
         return firePoint;
     }
 
-    private ShanDongFirePointEntity getShanDongFirePointByFirePoint(FirePointEntity firePoint) {
-        ShanDongFirePointEntity shanDongFirePoint = new ShanDongFirePointEntity();
-        shanDongFirePoint.setId(firePoint.getId());
-        shanDongFirePoint.setFireCode(firePoint.getFireCode());
-        shanDongFirePoint.setLongitude(firePoint.getLongitude());
-        shanDongFirePoint.setLatitude(firePoint.getLatitude());
-        shanDongFirePoint.setCountyCode(firePoint.getCountyCode());
-        shanDongFirePoint.setCountyName(firePoint.getCountyName());
-        shanDongFirePoint.setSatelliteTime(firePoint.getSatelliteTime());
-        shanDongFirePoint.setSatelliteType(firePoint.getSatelliteType());
-        shanDongFirePoint.setLandType(firePoint.getLandType());
-        shanDongFirePoint.setAddTime(firePoint.getAddTime());
-        shanDongFirePoint.setConfidence(firePoint.getConfidence());
-        shanDongFirePoint.setFirePointAddress(firePoint.getFirePointAddress());
-        shanDongFirePoint.setFireType(firePoint.getFireType());
-        shanDongFirePoint.setFireImage(firePoint.getFireImage());
-        shanDongFirePoint.setSatelliteImage(firePoint.getSatelliteImage());
-        shanDongFirePoint.setBeforeFireImage(firePoint.getBeforeFireImage());
-        shanDongFirePoint.setAfterFireImage(firePoint.getAfterFireImage());
-        shanDongFirePoint.setStreetCode(firePoint.getStreetCode());
-        shanDongFirePoint.setStreetName(firePoint.getStreetName());
-        shanDongFirePoint.setVerifyState("0");
-        return shanDongFirePoint;
-    }
-
     /**
      * 为实体类绑定地址、编号、名称
      */
@@ -341,8 +316,7 @@ public class FirePointServiceImpl implements FirePointService {
         String countyName = firePointEntity.getCountyName();
         String streetName = firePointEntity.getStreetName();
         String landType = firePointEntity.getLandType();
-        String content = firePointEntity.getSatelliteType() + "发现1个火点。\n卫星时间：" + satelliteTime + "；\nlongitude：" + formatLongitude + "；\nlatitude：" + formatLatitude + "；\ncountyName：" + countyName + "；\nstreetName：" + streetName + "；\nlandType：" + landType;
-        return content;
+        return firePointEntity.getSatelliteType() + "发现1个火点。\n卫星时间：" + satelliteTime + "；\nlongitude：" + formatLongitude + "；\nlatitude：" + formatLatitude + "；\ncountyName：" + countyName + "；\nstreetName：" + streetName + "；\nlandType：" + landType;
     }
 
     private String getMessageContent(ShanDongFirePointEntity firePointEntity) {
@@ -353,8 +327,7 @@ public class FirePointServiceImpl implements FirePointService {
         String countyName = firePointEntity.getCountyName();
         String streetName = firePointEntity.getStreetName();
         String landType = firePointEntity.getLandType();
-        String content = firePointEntity.getSatelliteType() + "发现1个待审核火点。\n卫星时间：" + satelliteTime + "；\nlongitude：" + formatLongitude + "；\nlatitude：" + formatLatitude + "；\ncountyName：" + countyName + "；\nstreetName：" + streetName + "；\nlandType：" + landType;
-        return content;
+        return firePointEntity.getSatelliteType() + "发现1个待审核火点。\n卫星时间：" + satelliteTime + "；\nlongitude：" + formatLongitude + "；\nlatitude：" + formatLatitude + "；\ncountyName：" + countyName + "；\nstreetName：" + streetName + "；\nlandType：" + landType;
     }
 
     /**
@@ -482,8 +455,7 @@ public class FirePointServiceImpl implements FirePointService {
 //        String endTimeString = DateTimeUtils.localDateTimeToString(endTime2);
 //
 //        return firePointQueryHelper.queryFirePoint(countyCode, startTimeString, endTimeString, null, null);
-        List<FirePointEntity> firePointEntities = firePointQueryHelper.queryFirePoint(countyCode, null, null, null, null);
-        return firePointEntities;
+        return firePointQueryHelper.queryFirePoint(countyCode, null, null, null, null);
     }
 
     /**