diff --git a/src/main/java/com/xkrs/model/qo/FirePointQo.java b/src/main/java/com/xkrs/model/qo/FirePointQo.java index bfff4e7..cbab1ae 100644 --- a/src/main/java/com/xkrs/model/qo/FirePointQo.java +++ b/src/main/java/com/xkrs/model/qo/FirePointQo.java @@ -44,7 +44,7 @@ public class FirePointQo { /** * 植被类型 */ - private String landtype; + private String landType; /** * 置信度 @@ -64,7 +64,7 @@ public class FirePointQo { /** * 乡镇街道区划编码 */ - private String towncode; + private String townCode; public FirePointQo() { } @@ -125,12 +125,12 @@ public class FirePointQo { 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() { @@ -157,16 +157,29 @@ public class FirePointQo { this.satelliteImage = satelliteImage; } - 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 public String toString() { - return "FirePointQo{" + "fireCode='" + fireCode + '\'' + ", countyCode=" + countyCode + ", countyName='" + countyName + '\'' + ", satelliteTimeTs=" + satelliteTimeTs + ", longitude=" + longitude + ", latitude=" + latitude + ", satelliteType='" + satelliteType + '\'' + ", landtype='" + landtype + '\'' + ", confidence='" + confidence + '\'' + ", fireImage='" + fireImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' + ", towncode='" + towncode + '\'' + '}'; + return "FirePointQo{" + + "fireCode='" + fireCode + '\'' + + ", countyCode=" + countyCode + + ", countyName='" + countyName + '\'' + + ", satelliteTimeTs=" + satelliteTimeTs + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", satelliteType='" + satelliteType + '\'' + + ", landType='" + landType + '\'' + + ", confidence='" + confidence + '\'' + + ", fireImage='" + fireImage + '\'' + + ", satelliteImage='" + satelliteImage + '\'' + + ", townCode='" + townCode + '\'' + + '}'; } } diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 6b253dc..77d0fc8 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -90,7 +90,7 @@ public class FirePointServiceImpl implements FirePointService { @CacheEvict(value = "FirePointServiceCache", allEntries = true) @Override public boolean insertFirePoint(FirePointQo firePointQo) { - if ("水体".equals(firePointQo.getLandtype())) { + if ("水体".equals(firePointQo.getLandType())) { return false; } if ("Himawari 8".equals(firePointQo.getSatelliteType())) { @@ -106,7 +106,7 @@ public class FirePointServiceImpl implements FirePointService { firePointEntity.setLongitude(firePointQo.getLongitude()); firePointEntity.setLatitude(firePointQo.getLatitude()); firePointEntity.setSatelliteType(firePointQo.getSatelliteType()); - firePointEntity.setLandType(firePointQo.getLandtype()); + firePointEntity.setLandType(firePointQo.getLandType()); firePointEntity.setConfidence(firePointQo.getConfidence()); firePointEntity.setAddTime(dateTimeToString(LocalDateTime.now())); firePointEntity.setFireType("0");