修改<从发布地图新建草稿没有复制目的地码数据>bug

This commit is contained in:
thesai 2021-01-11 11:27:28 +08:00
parent f5f8df1e28
commit 2618913522

View File

@ -207,8 +207,7 @@ public class DraftMapService implements IDraftMapService {
// 插入新副本
draftMapDAO.insert(draftMap);
if (draftMap.getDrawWay()) {
saveMapLogicDataNew(draftMap.getId(), getMapLogicDataNew(id));
saveMapLogicDataNew(draftMap, getMapLogicDataNew(id));
} else {
saveMapLogicData(draftMap.getId(), getMapLogicData(id));
@ -385,7 +384,7 @@ public class DraftMapService implements IDraftMapService {
iRealLineService.create(skinVO, userVO);
}
if (mapVO.isDrawWay()) {
saveMapLogicDataNew(draftMap.getId(), mapVO.getLogicDataNew());
saveMapLogicDataNew(draftMap, mapVO.getLogicDataNew());
} else {
saveMapLogicData(draftMap.getId(), mapVO.getLogicData());
}
@ -970,7 +969,8 @@ public class DraftMapService implements IDraftMapService {
}
}
private void saveMapLogicDataNew(Long id, MapLogicDataNewVO logicDataVO) {
private void saveMapLogicDataNew(DraftMapWithBLOBs draftMap, MapLogicDataNewVO logicDataVO) {
Long id = draftMap.getId();
if (Objects.isNull(logicDataVO)) {
return;
}
@ -989,7 +989,8 @@ public class DraftMapService implements IDraftMapService {
});
}
if (!CollectionUtils.isEmpty(logicDataVO.getDestinationCodeDefinitionList())) {
draftMap.setLogicData(JsonUtils.writeValueAsString(logicDataVO.getDestinationCodeDefinitionList()));
draftMapDAO.updateByPrimaryKeyWithBLOBs(draftMap);
}
if (!CollectionUtils.isEmpty(logicDataVO.getRoutingList())) {
logicDataVO.getRoutingList().forEach(routingVO -> {