liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
liuchengqian 2023-03-06 13:50:13 +08:00
parent 1ebf6e8b21
commit 49254d02a2
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java
View File

@ -7,16 +7,6 @@ public class AllFirePointQo {
*/
private String fireCode;
/**
* 省市区的编码
*/
private Long countyCode;
/**
* 省市区的名称
*/
private String countyName;
/**
* 卫星监测的时间戳
*/
@ -57,6 +47,16 @@ public class AllFirePointQo {
*/
private String satelliteImage;
/**
* 省市区的编码
*/
private Long countyCode;
/**
* 省市区的名称
*/
private String countyName;
/**
* 乡镇街道的编码
*/
@ -73,22 +73,6 @@ public class AllFirePointQo {
this.fireCode = fireCode;
}
public Long getCountyCode() {
return countyCode;
}
public void setCountyCode(Long countyCode) {
this.countyCode = countyCode;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public Long getSatelliteTimeTs() {
return satelliteTimeTs;
}
@ -153,6 +137,22 @@ public class AllFirePointQo {
this.satelliteImage = satelliteImage;
}
public Long getCountyCode() {
return countyCode;
}
public void setCountyCode(Long countyCode) {
this.countyCode = countyCode;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getTownCode() {
return townCode;
}
@ -165,8 +165,6 @@ public class AllFirePointQo {
public String toString() {
return "AllFirePointQo{" +
"fireCode='" + fireCode + '\'' +
", countyCode=" + countyCode +
", countyName='" + countyName + '\'' +
", satelliteTimeTs=" + satelliteTimeTs +
", longitude=" + longitude +
", latitude=" + latitude +
@ -175,6 +173,8 @@ public class AllFirePointQo {
", confidence='" + confidence + '\'' +
", fireImage='" + fireImage + '\'' +
", satelliteImage='" + satelliteImage + '\'' +
", countyCode=" + countyCode +
", countyName='" + countyName + '\'' +
", townCode='" + townCode + '\'' +
'}';
}

12
src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java
View File

@ -93,8 +93,6 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
//普通渠道来的火点直接入库普通火点库
FirePointOrdinaryEntity firePointOrdinaryEntity = new FirePointOrdinaryEntity();
firePointOrdinaryEntity.setFireCode(fireCode);
firePointOrdinaryEntity.setCountyCode(String.valueOf(countyCode));
firePointOrdinaryEntity.setCountyName(countyName);
firePointOrdinaryEntity.setSatelliteTime(satelliteTime);
firePointOrdinaryEntity.setLongitude(longitude);
firePointOrdinaryEntity.setLatitude(latitude);
@ -105,6 +103,8 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
firePointOrdinaryEntity.setSatelliteImage(satelliteImage);
firePointOrdinaryEntity.setTownCode(townCode);
firePointOrdinaryEntity.setAddTime(addTime);
firePointOrdinaryEntity.setCountyCode(String.valueOf(countyCode));
firePointOrdinaryEntity.setCountyName(countyName);
bindFirePointAddress(firePointOrdinaryEntity);
DataWrapper2<Boolean, String> checkDuplicatedWrapper1 = FirePointFilterUtils.checkDuplicated(firePointOrdinaryDao, firePointOrdinaryEntity);
if (checkDuplicatedWrapper1.getData1()) {
@ -120,8 +120,6 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
if (!inPreciseTimeRange) {
FirePointPreciseEntity firePointPreciseEntity = new FirePointPreciseEntity();
firePointPreciseEntity.setFireCode(fireCode);
firePointPreciseEntity.setCountyCode(String.valueOf(countyCode));
firePointPreciseEntity.setCountyName(countyName);
firePointPreciseEntity.setSatelliteTime(satelliteTime);
firePointPreciseEntity.setLongitude(longitude);
firePointPreciseEntity.setLatitude(latitude);
@ -132,6 +130,8 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
firePointPreciseEntity.setSatelliteImage(satelliteImage);
firePointPreciseEntity.setTownCode(townCode);
firePointPreciseEntity.setAddTime(addTime);
firePointPreciseEntity.setCountyCode(String.valueOf(countyCode));
firePointPreciseEntity.setCountyName(countyName);
bindFirePointAddress(firePointPreciseEntity);
DataWrapper2<Boolean, String> checkDuplicatedWrapper2 = FirePointFilterUtils.checkDuplicated(firePointPreciseDao, firePointPreciseEntity);
if (checkDuplicatedWrapper2.getData1()) {
@ -185,8 +185,6 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
if (inPreciseTimeRange) {
FirePointPreciseEntity firePointPreciseEntity = new FirePointPreciseEntity();
firePointPreciseEntity.setFireCode(fireCode);
firePointPreciseEntity.setCountyCode(String.valueOf(countyCode));
firePointPreciseEntity.setCountyName(countyName);
firePointPreciseEntity.setSatelliteTime(satelliteTime);
firePointPreciseEntity.setLongitude(longitude);
firePointPreciseEntity.setLatitude(latitude);
@ -197,6 +195,8 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService {
firePointPreciseEntity.setSatelliteImage(satelliteImage);
firePointPreciseEntity.setTownCode(townCode);
firePointPreciseEntity.setAddTime(addTime);
firePointPreciseEntity.setCountyCode(String.valueOf(countyCode));
firePointPreciseEntity.setCountyName(countyName);
bindFirePointAddress(firePointPreciseEntity);
DataWrapper2<Boolean, String> checkDuplicatedWrapper2 = FirePointFilterUtils.checkDuplicated(firePointPreciseDao, firePointPreciseEntity);
if (checkDuplicatedWrapper2.getData1()) {