BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整

pull/1121/head
梁宇奇 2025-07-14 22:24:31 +08:00
parent 3a13e1b580
commit 0733e51628
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
View File

@ -1547,25 +1547,28 @@ public class XktTask {
try {
Map<Long, ZtoRegion> ztoRegionMap = ztoExpressManager.getAllRegion()
.stream()
.collect(Collectors.toMap(ZtoRegion::getId, Function.identity()));
.filter(o -> Integer.valueOf(1).equals(o.getEnabled()))
.collect(Collectors.toMap(ZtoRegion::getId, o -> o, (o, n) -> n));
List<ExpressRegion> expressRegions = new ArrayList<>(ztoRegionMap.size());
ztoRegionMap.values().forEach(ztoRegion -> {
for (ZtoRegion ztoRegion : ztoRegionMap.values()) {
if (ztoRegion.getLayer() != null && ztoRegion.getLayer() > 4) {
continue;
}
ExpressRegion expressRegion = new ExpressRegion();
expressRegion.setId(ztoRegion.getId());
expressRegion.setRegionCode(ztoRegion.getNationalCode());
expressRegion.setRegionCode(ztoRegion.getCode());
expressRegion.setRegionName(ztoRegion.getFullName());
if (ztoRegion.getParentId() != null) {
ZtoRegion ztoParentRegion = ztoRegionMap.get(ztoRegion.getParentId());
if (ztoParentRegion != null) {
expressRegion.setParentRegionCode(ztoParentRegion.getNationalCode());
expressRegion.setParentRegionCode(ztoParentRegion.getCode());
expressRegion.setParentRegionName(ztoParentRegion.getFullName());
}
}
expressRegion.setRegionLevel(ztoRegion.getLayer());
expressRegion.setRegionLevel(Optional.ofNullable(ztoRegion.getLayer()).map(n -> n - 1).orElse(0));
expressRegion.setVersion(0L);
expressRegion.setDelFlag(Constants.UNDELETED);
expressRegions.add(expressRegion);
});
}
expressService.clearAndInsertAllRegion(expressRegions);
} catch (Exception e) {
log.error("同步行政区划异常", e);

4
xkt/src/main/java/com/ruoyi/xkt/thirdpart/zto/ZtoRegion.java
View File

@ -32,4 +32,8 @@ public class ZtoRegion {
* 层级
*/
private Integer layer;
/**
* 是否有效
*/
private Integer enabled;
}