Change kmz name as jobname_uavId
This commit is contained in:
parent
460af8d011
commit
f032dab83c
@ -392,7 +392,7 @@ public class JmJobServiceImpl implements JmJobService {
|
|||||||
String[] kmzDirPath = fileTypeService.getDirectoryPath(FileTypeEnum.UAV_KMZ, jobExecId);
|
String[] kmzDirPath = fileTypeService.getDirectoryPath(FileTypeEnum.UAV_KMZ, jobExecId);
|
||||||
for (JmJobUav juav : job.getUavList()) {
|
for (JmJobUav juav : job.getUavList()) {
|
||||||
Long uavId = juav.getUavId();
|
Long uavId = juav.getUavId();
|
||||||
generateKmz(kmzDirPath[0], uavId, juav);
|
generateKmz(kmzDirPath[0], uavId, juav, job.getName());
|
||||||
log.info("生成kmz:" + kmzDirPath[0]);
|
log.info("生成kmz:" + kmzDirPath[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -430,11 +430,11 @@ public class JmJobServiceImpl implements JmJobService {
|
|||||||
/**
|
/**
|
||||||
* 生成kmz文件
|
* 生成kmz文件
|
||||||
*/
|
*/
|
||||||
private void generateKmz(String dirPath, Long uavId, JmJobUav uav) {
|
private void generateKmz(String dirPath, Long uavId, JmJobUav uav, String jobName) {
|
||||||
String kmlPath = dirPath + "/" + uavId; // 临时目录
|
String kmlPath = dirPath + "/" + uavId; // 临时目录
|
||||||
KmzGen.generateKmz(kmlPath, uav, 0, uav.getSar0().getHeadingDiff());
|
KmzGen.generateKmz(kmlPath, uav, 0, uav.getSar0().getHeadingDiff());
|
||||||
try {
|
try {
|
||||||
ZipUtil.zip(kmlPath, dirPath + "/" + uavId + ".kmz", false);
|
ZipUtil.zip(kmlPath, dirPath + "/" + jobName + "_" + uavId + ".kmz", false);
|
||||||
FileUtil.delete(kmlPath);
|
FileUtil.delete(kmlPath);
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
throw new ServiceException("生成zip文件出错:" + ex.getMessage());
|
throw new ServiceException("生成zip文件出错:" + ex.getMessage());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user