center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #6303 from dataease/pr@dev@perf_map_file

Browse Source 
fix: 厦门地图文件覆盖
This commit is contained in:
fit2cloud-chenyw 2023-10-20 11:53:10 +08:00 committed by GitHub
commit 70ab6f2392
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/backend/src/main/java/io/dataease/map/service/MapTransferService.java
View File

@ -3,7 +3,6 @@ package io.dataease.map.service;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ArrayUtil;
import com.google.gson.Gson;
import io.dataease.plugins.common.base.domain.ChartView;
import io.dataease.plugins.common.base.domain.ChartViewExample;
import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
@ -40,17 +39,20 @@ public class MapTransferService {
private static final String FULL_FILE_SUFFIX = "_full.json";
private static final List<String> coverFileNameList = new ArrayList<>();
@PostConstruct
public void init() {
MATCH_TYPES.add("map");
MATCH_TYPES.add("buddle-map");
coverFileNameList.add("350200_full.json");
}
@Resource
private ChartViewMapper chartViewMapper;
public void execute() {
ChartViewExample example = new ChartViewExample();
List<ChartViewWithBLOBs> chartViews = chartViewMapper.selectByExampleWithBLOBs(example);
@ -70,7 +72,7 @@ public class MapTransferService {
String chinaRootPath = geoPath + FULL_KEY + FILE_SEPARATOR;
File chinaRootDir = new File(chinaRootPath);
File[] files = chinaRootDir.listFiles();
if(ArrayUtil.isEmpty(files)) return;
if (ArrayUtil.isEmpty(files)) return;
Map<String, List<File>> listMap = Arrays.stream(files).filter(FileUtil::isFile).collect(Collectors.groupingBy(this::fileType));
if (ObjectUtils.isEmpty(listMap)) return;
moveFiles(listMap, BORDER_KEY);
@ -86,7 +88,7 @@ public class MapTransferService {
String fileName = file.getName();
String newFilePath = dirPath + GLOBAL_CHINA_PREFIX + FILE_SEPARATOR + GLOBAL_CHINA_PREFIX + fileName;
File target = new File(newFilePath);
if(!target.exists()) {
if (coverFileNameList.contains(fileName) || !target.exists()) {
FileUtil.move(file, target, true);
}
});
@ -128,7 +130,7 @@ public class MapTransferService {
private Boolean customMatch(Map<String, Object> customAttrMap) {
Object codeObj = null;
if((codeObj = customAttrMap.get(AREA_CODE_KEY)) != null) {
if ((codeObj = customAttrMap.get(AREA_CODE_KEY)) != null) {
String code = codeObj.toString();
boolean matych = code.length() == 6;
customAttrMap.put(AREA_CODE_KEY, GLOBAL_CHINA_PREFIX + code);