From 3068935bbf9f38b41dad7f45d3cfc7b3d116224c Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Mon, 13 Mar 2023 21:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BF=99=E4=BA=9B=E5=82=BB?=
 =?UTF-8?q?=E9=80=BC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DispatchFirePointController.java          |  2 +-
 .../com/xkrs/model/qo/AllFirePointQo.java     | 24 +++++++++----------
 .../impl/DispatchFirePointServiceImpl.java    | 12 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/xkrs/controller/DispatchFirePointController.java b/src/main/java/com/xkrs/controller/DispatchFirePointController.java
index 5be8664..ee273c5 100644
--- a/src/main/java/com/xkrs/controller/DispatchFirePointController.java
+++ b/src/main/java/com/xkrs/controller/DispatchFirePointController.java
@@ -69,7 +69,7 @@ public class DispatchFirePointController {
 //            sysUserDao.save(sysUserEntity);
 //        }
 
-        for (int i = 0; i < 462; i++) {
+        for (int i = 450; i < 500; i++) {
             firePointOrdinaryDao.updateProCityCode(i * 5000L, (i + 1) * 5000L);
             firePointOrdinaryDao.updateProCityName(i * 5000L, (i + 1) * 5000L);
             System.out.println(i + "/" + 462);
diff --git a/src/main/java/com/xkrs/model/qo/AllFirePointQo.java b/src/main/java/com/xkrs/model/qo/AllFirePointQo.java
index d703c20..4af3d4b 100644
--- a/src/main/java/com/xkrs/model/qo/AllFirePointQo.java
+++ b/src/main/java/com/xkrs/model/qo/AllFirePointQo.java
@@ -30,7 +30,7 @@ public class AllFirePointQo {
     /**
      * 植被类型
      */
-    private String landType;
+    private String landtype;
 
     /**
      * 置信度
@@ -60,7 +60,7 @@ public class AllFirePointQo {
     /**
      * 乡镇街道的编码
      */
-    private String townCode;
+    private String towncode;
 
     public AllFirePointQo() {
     }
@@ -105,12 +105,12 @@ public class AllFirePointQo {
         this.satelliteType = satelliteType;
     }
 
-    public String getLandType() {
-        return landType;
+    public String getLandtype() {
+        return landtype;
     }
 
-    public void setLandType(String landType) {
-        this.landType = landType;
+    public void setLandtype(String landtype) {
+        this.landtype = landtype;
     }
 
     public String getConfidence() {
@@ -153,12 +153,12 @@ public class AllFirePointQo {
         this.countyName = countyName;
     }
 
-    public String getTownCode() {
-        return townCode;
+    public String getTowncode() {
+        return towncode;
     }
 
-    public void setTownCode(String townCode) {
-        this.townCode = townCode;
+    public void setTowncode(String towncode) {
+        this.towncode = towncode;
     }
 
     @Override
@@ -169,13 +169,13 @@ public class AllFirePointQo {
                 ", longitude=" + longitude +
                 ", latitude=" + latitude +
                 ", satelliteType='" + satelliteType + '\'' +
-                ", landType='" + landType + '\'' +
+                ", landtype='" + landtype + '\'' +
                 ", confidence='" + confidence + '\'' +
                 ", fireImage='" + fireImage + '\'' +
                 ", satelliteImage='" + satelliteImage + '\'' +
                 ", countyCode=" + countyCode +
                 ", countyName='" + countyName + '\'' +
-                ", townCode='" + townCode + '\'' +
+                ", towncode='" + towncode + '\'' +
                 '}';
     }
 }
diff --git a/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java
index 9c68271..337d6f2 100644
--- a/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java
+++ b/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java
@@ -61,7 +61,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
      */
     @Override
     public String insertFirePointChannelOrdinary(AllFirePointQo firePointQo) {
-        DataWrapper2<Boolean, String> checkLandTypeWrapper = FirePointFilterUtils.checkLandType(firePointQo.getLandType());
+        DataWrapper2<Boolean, String> checkLandTypeWrapper = FirePointFilterUtils.checkLandType(firePointQo.getLandtype());
         if (!checkLandTypeWrapper.getData1()) {
             return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, checkLandTypeWrapper.getData2(), locale);
         }
@@ -79,13 +79,13 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
         Double longitude = firePointQo.getLongitude();
         Double latitude = firePointQo.getLatitude();
         String satelliteType = firePointQo.getSatelliteType();
-        String landType = firePointQo.getLandType();
+        String landType = firePointQo.getLandtype();
         String confidence = firePointQo.getConfidence();
         String fireImage = firePointQo.getFireImage();
         String satelliteImage = firePointQo.getSatelliteImage();
         String countyCode = String.valueOf(firePointQo.getCountyCode());
         String countyName = firePointQo.getCountyName();
-        String townCode = firePointQo.getTownCode();
+        String townCode = firePointQo.getTowncode();
 
         LocalDateTime satelliteLocalDateTime = LocalDateTime.ofEpochSecond(satelliteTimeTs, 0, ZoneOffset.ofHours(8));
         String satelliteTime = DateTimeUtils.localDateTimeToString(satelliteLocalDateTime);//卫星时间
@@ -176,7 +176,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
      */
     @Override
     public String insertFirePointChannelPrecise(AllFirePointQo firePointQo) {
-        DataWrapper2<Boolean, String> checkLandTypeWrapper = FirePointFilterUtils.checkLandType(firePointQo.getLandType());
+        DataWrapper2<Boolean, String> checkLandTypeWrapper = FirePointFilterUtils.checkLandType(firePointQo.getLandtype());
         if (!checkLandTypeWrapper.getData1()) {
             return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, checkLandTypeWrapper.getData2(), locale);
         }
@@ -193,13 +193,13 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
         Double longitude = firePointQo.getLongitude();
         Double latitude = firePointQo.getLatitude();
         String satelliteType = firePointQo.getSatelliteType();
-        String landType = firePointQo.getLandType();
+        String landType = firePointQo.getLandtype();
         String confidence = firePointQo.getConfidence();
         String fireImage = firePointQo.getFireImage();
         String satelliteImage = firePointQo.getSatelliteImage();
         String countyCode = String.valueOf(firePointQo.getCountyCode());
         String countyName = firePointQo.getCountyName();
-        String townCode = firePointQo.getTownCode();
+        String townCode = firePointQo.getTowncode();
 
         LocalDateTime satelliteLocalDateTime = LocalDateTime.ofEpochSecond(satelliteTimeTs, 0, ZoneOffset.ofHours(8));
         String satelliteTime = DateTimeUtils.localDateTimeToString(satelliteLocalDateTime);//卫星时间