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-24 11:37:53 +08:00
parent bb98df5bed
commit c1b14154ad
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,24 +184,24 @@ public class FirePointServiceImpl implements FirePointService {
shanDongFirePoint.setCountyCode(firePointQo.getCountyCode().toString()); shanDongFirePoint.setCountyCode(firePointQo.getCountyCode().toString());
shanDongFirePoint.setCountyName(firePointQo.getCountyName()); shanDongFirePoint.setCountyName(firePointQo.getCountyName());
//设置乡镇街道区划编码和名称---Start // //设置乡镇街道区划编码和名称---Start
String townCode = firePointQo.getTowncode(); // String townCode = firePointQo.getTowncode();
shanDongFirePoint.setStreetCode(townCode); // shanDongFirePoint.setStreetCode(townCode);
shanDongFirePoint.setStreetName(""); // shanDongFirePoint.setStreetName("");
List<StreetEntity> streetList = streetService.findByStreetCode(townCode); // List<StreetEntity> streetList = streetService.findByStreetCode(townCode);
if (null != streetList && streetList.size() > 0) { // if (null != streetList && streetList.size() > 0) {
StreetEntity street = streetList.get(0); // StreetEntity street = streetList.get(0);
shanDongFirePoint.setStreetName(street.getStreetName()); // shanDongFirePoint.setStreetName(street.getStreetName());
if (!street.getCountyCode().equals(shanDongFirePoint.getCountyCode())) {//这三个错误日志可以监视接收的towncode有木有问题，日志里不出现"发生重大错误"就是没问题 // if (!street.getCountyCode().equals(shanDongFirePoint.getCountyCode())) {//这三个错误日志可以监视接收的towncode有木有问题，日志里不出现"发生重大错误"就是没问题
log.info("发生重大错误，接收的countyCode是" + shanDongFirePoint.getCountyCode() + "，本地表中根据streetCode（towncode）" + townCode + "找到的countyCode是" + street.getCountyCode() + "，firePointQo详情=" + firePointQo.toString()); // log.info("发生重大错误，接收的countyCode是" + shanDongFirePoint.getCountyCode() + "，本地表中根据streetCode（towncode）" + townCode + "找到的countyCode是" + street.getCountyCode() + "，firePointQo详情=" + firePointQo.toString());
} // }
if (!street.getCountyName().equals(shanDongFirePoint.getCountyName())) { // if (!street.getCountyName().equals(shanDongFirePoint.getCountyName())) {
log.info("发生重大错误，接收的countyName是" + shanDongFirePoint.getCountyName() + "，本地表中根据streetCode（towncode）" + townCode + "找到的countyName是" + street.getCountyName() + "，firePointQo详情=" + firePointQo.toString()); // log.info("发生重大错误，接收的countyName是" + shanDongFirePoint.getCountyName() + "，本地表中根据streetCode（towncode）" + townCode + "找到的countyName是" + street.getCountyName() + "，firePointQo详情=" + firePointQo.toString());
} // }
} else { // } else {
log.info("发生重大错误，传过来的towncode（" + townCode + "）连找都找不到，firePointQo详情=" + firePointQo.toString()); // log.info("发生重大错误，传过来的towncode（" + townCode + "）连找都找不到，firePointQo详情=" + firePointQo.toString());
} // }
//设置乡镇街道区划编码和名称---End // //设置乡镇街道区划编码和名称---End
shanDongFirePoint.setSatelliteTime(DateTimeUtil.timeMillisToString(firePointQo.getSatelliteTimeTs().longValue())); shanDongFirePoint.setSatelliteTime(DateTimeUtil.timeMillisToString(firePointQo.getSatelliteTimeTs().longValue()));
shanDongFirePoint.setLongitude(firePointQo.getLongitude()); shanDongFirePoint.setLongitude(firePointQo.getLongitude());
@ -321,6 +321,13 @@ public class FirePointServiceImpl implements FirePointService {
GaoDeIgGeocodeVo.Regeocode reGeoCode = geocode.getRegeocodes().get(0); GaoDeIgGeocodeVo.Regeocode reGeoCode = geocode.getRegeocodes().get(0);
String formattedAddress = reGeoCode.getFormatted_address(); String formattedAddress = reGeoCode.getFormatted_address();
firePointEntity.setFirePointAddress(formattedAddress); 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());
} }
/** /**