~nishiwei/ard-uav-server.git

			@@ -2,8 +2,6 @@

			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.collection.CollectionUtil;
			import cn.hutool.core.io.FileUtil;
			import com.ard.common.utils.SecurityUtils;
			import com.ard.oss.service.impl.OssServiceContext;
			import com.ard.route.constant.FileTypeConstants;
			import com.ard.route.domain.RoutePointReq;
			@@ -11,12 +9,12 @@
			import com.ard.route.domain.WaypointHeadingReq;
			import com.ard.route.domain.WaypointTurnReq;
			import com.ard.route.domain.kml.*;
			import com.ard.route.domain.route.ArdRouteInformation;
			import com.ard.route.domain.route.ArdRouteInfo;
			import com.ard.route.domain.vo.KmzInfoVO;
			import com.ard.route.domain.vo.KmzResultVo;
			import com.ard.route.enums.kml.ExitOnRCLostEnums;
			import com.ard.route.service.IArdRouteInformationService;
			import com.ard.route.util.FileUtils;
			import com.ard.route.service.IArdRouteInfoService;
			import com.ard.route.util.InitializationUtils;
			import com.ard.route.util.RouteFileUtils;
			import com.ard.route.service.UavRouteService;
			import com.thoughtworks.xstream.XStream;
			@@ -26,7 +24,6 @@
			import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.mock.web.MockMultipartFile;
			import org.springframework.stereotype.Service;
			import org.springframework.web.multipart.MultipartFile;
			@@ -52,21 +49,26 @@
			private OssServiceContext ossService;

			@Resource
			private IArdRouteInformationService ardRouteInformationService;
			private IArdRouteInfoService ardRouteInformationService;

			InitializationUtils init = new InitializationUtils();

			/**
			* 编辑kmz文件
			*/
			@Override
			public String updateKmz(UavRouteReq uavRouteReq,String fileName){
			public KmzResultVo updateKmz(UavRouteReq uavRouteReq,String fileName){
			KmzResultVo result = new KmzResultVo();
			// 校验修改的文件是否存在
			ArdRouteInformation routeInformation = ardRouteInformationService.selectArdRouteInformationByName(fileName);
			ArdRouteInfo routeInformation = ardRouteInformationService.selectArdRouteInfoByName(fileName);
			if ( routeInformation == null ){
			return "修改航线文件失败，请检查文件是否存在";
			result.setData("修改航线文件失败，请检查文件是否存在");
			return result;
			}

			// 获取文件
			String minioUrl = routeInformation.getMinioUpPath();
			try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
			String minioUrlName = subStringMinioUrlName(routeInformation.getPath());
			try (InputStream inputStream = ossService.getObject(kmzPath,minioUrlName);
			ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
			ArchiveEntry entry;
			KmlInfo kmlInfo = new KmlInfo();
			@@ -83,13 +85,13 @@
			this.handleRouteUpdate(wpmlInfo, uavRouteReq, FileTypeConstants.WPML, kmlParams);
			}
			}
			// 删除minio的文件

			// 插入修改好的minio文件

			return RouteFileUtils.buildKmz("更新航线kmz文件111111", kmlInfo, wpmlInfo, kmzPath);
			// 删除文件
			ossService.deleteObject(kmzPath, minioUrlName);
			return buildKmzMethod(routeInformation.getName(), kmlInfo, wpmlInfo);
			} catch (Exception e) {
			return "更新航线kmz文件失败";
			e.printStackTrace();
			result.setData("更新航线kmz文件失败");
			return result;
			}
			}

			@@ -138,11 +140,13 @@
			* 生成kmz文件(带航点)
			*/
			@Override
			public KmzResultVo buildKmz(UavRouteReq uavRouteReq, String fileName) {
			public KmzResultVo buildKmz(UavRouteReq uavRouteReq, String kmzName) {
			// 赋值默认参数
			init.initialization(uavRouteReq);
			KmlParams kmlParams = new KmlParams();
			BeanUtils.copyProperties(uavRouteReq, kmlParams);
			kmlParams.setRoutePointList(BeanUtil.copyToList(uavRouteReq.getRoutePointList(), RoutePointInfo.class));
			return buildKmz(fileName, kmlParams);
			return buildKmz(kmzName, kmlParams);
			}

			/**
			@@ -155,7 +159,7 @@
			public KmzResultVo buildKmz(String fileName, KmlParams kmlParams) {
			KmlInfo kmlInfo = buildKml(kmlParams);
			KmlInfo wpmlInfo = buildWpml(kmlParams);
			return buildKmz(fileName, kmlInfo, wpmlInfo);
			return buildKmzMethod(fileName, kmlInfo, wpmlInfo);
			}

			/**
			@@ -166,7 +170,7 @@
			* @param wpmlInfo wpml 文件信息
			* @return 本地文件路径
			*/
			public KmzResultVo buildKmz(String fileName, KmlInfo kmlInfo, KmlInfo wpmlInfo) {
			public KmzResultVo buildKmzMethod(String fileName, KmlInfo kmlInfo, KmlInfo wpmlInfo) {
			XStream xStream = new XStream(new DomDriver());
			xStream.processAnnotations(KmlInfo.class);
			xStream.addImplicitCollection(KmlActionGroup.class, "action");
			@@ -190,15 +194,17 @@
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			result.setUpPath(localFilePath + fileName + ".kmz");
			result.setPath(localFilePath + fileName + ".kmz");
			return result;
			}else {
			try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
			ZipOutputStream zipOutputStream = new ZipOutputStream(baos)) {
			zipOutputStream.setLevel(0);

			// 创建KMZ文件内容
			// 创建 wpmz 目录中的 template.kml 文件条目
			buildZipFile("wpmz/template.kml", zipOutputStream, kml);

			// 创建 wpmz 目录中的 waylines.wpml 文件条目
			buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);

			zipOutputStream.finish();
			@@ -215,10 +221,7 @@
			new ByteArrayInputStream(baos.toByteArray())
			);
			String kmzFilePath = ossService.upload(kmzPath,multipartFile);
			result.setFileNameNew(getFileNameWithoutExtension(kmzFilePath));
			result.setMinioUpPath(extractFilePath(kmzFilePath));
			result.setUpPath(kmzFilePath);
			result.setUpFileSize(fileSize);
			result.setPath(kmzFilePath);
			return result;
			} catch (Exception e) {
			throw new RuntimeException("KMZ文件生成或上传失败", e);
			@@ -249,4 +252,43 @@
			}
			return null;
			}

			@Override
			public KmzResultVo updateKmzNew(UavRouteReq uavRouteReq, String oldFile, String newFile) {
			KmzResultVo result = new KmzResultVo();
			// 校验修改的文件是否存在
			ArdRouteInfo routeInformation = ardRouteInformationService.selectArdRouteInfoByName(oldFile);
			if ( routeInformation == null ){
			result.setData("修改航线文件失败，请检查文件是否存在");
			return result;
			}

			// 获取文件
			String minioUrl = subStringMinioUrlName(routeInformation.getPath());
			try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
			ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
			ArchiveEntry entry;
			KmlInfo kmlInfo = new KmlInfo();
			KmlInfo wpmlInfo = new KmlInfo();
			KmlParams kmlParams = new KmlParams();
			while (!Objects.isNull(entry = archiveInputStream.getNextEntry())) {
			String name = entry.getName();
			if (name.toLowerCase().endsWith(".kml")) {
			kmlInfo = RouteFileUtils.parseKml(archiveInputStream);
			buildKmlParams(kmlParams, kmlInfo);
			this.handleRouteUpdate(kmlInfo, uavRouteReq, FileTypeConstants.KML, kmlParams);
			} else if (name.toLowerCase().endsWith(".wpml")) {
			wpmlInfo = RouteFileUtils.parseKml(archiveInputStream);
			this.handleRouteUpdate(wpmlInfo, uavRouteReq, FileTypeConstants.WPML, kmlParams);
			}
			}
			// 删除文件
			ossService.deleteObject(kmzPath, minioUrl);
			return buildKmzMethod(newFile, kmlInfo, wpmlInfo);
			} catch (Exception e) {
			result.setData("更新航线kmz文件失败");
			return result;
			}
			}

			}