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

山东省内 替换街道级区划编码

Browse Source
This commit is contained in:
liuchengqian 2022-10-22 21:41:28 +08:00
parent b70763c1f5
commit aa6cde425d
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/xkrs/model/qo/FirePointQo.java
View File

@ -61,21 +61,12 @@ public class FirePointQo {
*/
private String satelliteImage;
public FirePointQo() {
}
/**
* 乡镇街道区划编码
*/
private String towncode;
public FirePointQo(String fireCode, Integer countyCode, String countyName, Integer satelliteTimeTs, Double longitude, Double latitude, String satelliteType, String landtype, String confidence, String fireImage, String satelliteImage) {
this.fireCode = fireCode;
this.countyCode = countyCode;
this.countyName = countyName;
this.satelliteTimeTs = satelliteTimeTs;
this.longitude = longitude;
this.latitude = latitude;
this.satelliteType = satelliteType;
this.landtype = landtype;
this.confidence = confidence;
this.fireImage = fireImage;
this.satelliteImage = satelliteImage;
public FirePointQo() {
}
public String getFireCode() {
@ -166,20 +157,16 @@ public class FirePointQo {
this.satelliteImage = satelliteImage;
}
public String getTowncode() {
return 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 + '\'' +
'}';
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 + '\'' + '}';
}
}

31
src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.xkrs.model.qo.FirePointQo;
import com.xkrs.model.vo.GaoDeIgGeocodeVo;
import com.xkrs.service.FirePointService;
import com.xkrs.service.GlobalConfigService;
import com.xkrs.service.StreetService;
import com.xkrs.sms.PushHelper;
import com.xkrs.sms.SMSHelper;
import com.xkrs.utils.*;
@ -72,6 +73,9 @@ public class FirePointServiceImpl implements FirePointService {
@Resource
private GlobalConfigService globalConfigService;
@Resource
private StreetService streetService;
@Resource
private AgentOrgDao agentOrgDao;
@ -179,6 +183,26 @@ public class FirePointServiceImpl implements FirePointService {
shanDongFirePoint.setFireCode(firePointQo.getFireCode());
shanDongFirePoint.setCountyCode(firePointQo.getCountyCode().toString());
shanDongFirePoint.setCountyName(firePointQo.getCountyName());
//设置乡镇街道区划编码和名称---Start
String townCode = firePointQo.getTowncode();
shanDongFirePoint.setStreetCode(townCode);
shanDongFirePoint.setStreetName("");
List<StreetEntity> streetList = streetService.findByStreetCode(townCode);
if (null != streetList && streetList.size() > 0) {
StreetEntity street = streetList.get(0);
shanDongFirePoint.setStreetName(street.getStreetName());
if (!street.getCountyCode().equals(shanDongFirePoint.getCountyCode())) {//这三个错误日志可以监视接收的towncode有木有问题，日志里不出现"发生重大错误"就是没问题
log.info("发生重大错误，接收的countyCode是" + shanDongFirePoint.getCountyCode() + "，本地表中根据streetCode（towncode）" + townCode + "找到的countyCode是" + street.getCountyCode() + "，firePointQo详情=" + firePointQo.toString());
}
if (!street.getCountyName().equals(shanDongFirePoint.getCountyName())) {
log.info("发生重大错误，接收的countyName是" + shanDongFirePoint.getCountyName() + "，本地表中根据streetCode（towncode）" + townCode + "找到的countyName是" + street.getCountyName() + "，firePointQo详情=" + firePointQo.toString());
}
} else {
log.info("发生重大错误，传过来的towncode（" + townCode + "）连找都找不到，firePointQo详情=" + firePointQo.toString());
}
//设置乡镇街道区划编码和名称---End
shanDongFirePoint.setSatelliteTime(DateTimeUtil.timeMillisToString(firePointQo.getSatelliteTimeTs().longValue()));
shanDongFirePoint.setLongitude(firePointQo.getLongitude());
shanDongFirePoint.setLatitude(firePointQo.getLatitude());
@ -297,13 +321,6 @@ public class FirePointServiceImpl implements FirePointService {
GaoDeIgGeocodeVo.Regeocode reGeoCode = geocode.getRegeocodes().get(0);
String formattedAddress = reGeoCode.getFormatted_address();
firePointEntity.setFirePointAddress(formattedAddress);
GaoDeIgGeocodeVo.AddressComponent addressComponent = reGeoCode.getAddressComponent().get(0);
firePointEntity.setCountyCode(addressComponent.getAdcode());
firePointEntity.setCountyName(addressComponent.getDistrict());
String townCode = addressComponent.getTowncode();
String fixedTownCode = townCode.length() > 9 ? townCode.substring(0, 9) : townCode;
firePointEntity.setStreetCode(fixedTownCode);
firePointEntity.setStreetName(addressComponent.getTownship());
}
/**