drone/drone-java.git

			@@ -4,15 +4,15 @@
			import com.dji.sample.common.model.PaginationData;
			import com.dji.sample.common.model.ResponseResult;
			import com.dji.sample.common.util.MinioUrlUtils;
			import com.dji.sample.log.aspect.SysLogAnnotation;
			import com.dji.sample.media.model.MediaFileEntity;
			import com.dji.sample.media.service.impl.FileServiceImpl;
			import com.dji.sample.patches.model.Param.PatchesParam;
			import com.dji.sample.patches.model.entity.LotInfo;
			import com.dji.sample.patches.service.GetPatchesService;
			import com.dji.sample.patches.service.ShpToDataSourceService;
			import com.dji.sample.patches.service.impl.ShpToDataSourceServiceImpl;
			import com.dji.sample.patches.utils.DistrictCodeUtils;
			import com.dji.sample.patches.utils.GeoToolsUtil;
			import com.dji.sample.patches.utils.PointPO;
			import com.dji.sample.patches.utils.TimerUtil;
			import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
			import com.dji.sample.wayline.model.entity.WaylineFileEntity;
			@@ -68,8 +68,11 @@
			@RequestParam(name = "xzqdm", required = false) String xzqdm,
			@RequestParam(name = "bsm", required = false) String bsm,
			@RequestParam(name = "xmc", required = false) String xmc,
			@RequestParam(name = "investigate", required = false) Integer investigate
			) {
			@RequestParam(name = "investigate", required = false) Integer investigate,
			@RequestParam(name = "dkmj", required = false) Double dkmj,
			@RequestParam(name = "isPlan",required = false) Integer isPlan
			) {
			fileService.getNoaddFile();
			//调用service分页查询
			PatchesParam param = PatchesParam.builder()
			.page(page)
			@@ -80,6 +83,8 @@
			.bsm(bsm)
			.xmc(xmc)
			.investigate(investigate)
			.dkmj(dkmj)
			.isPlan(isPlan)
			.build();
			PaginationData<LotInfo> data = getPatchesService.limitGet(param);
			return ResponseResult.success(data);
			@@ -120,22 +125,34 @@
			@GetMapping("/getWayline")
			public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list) {
			try {
			MultipartFile file = timerUtil.getFile(waylineName, list);
			MultipartFile file = timerUtil.getFile(waylineName, list, 25.8917266, 116.020940643);
			return ResponseResult.success(file);
			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			}

			@GetMapping("/getPoint")
			public List<PointPO> getPoint(@RequestParam List<Integer> list,
			@RequestParam Double airportLat,
			@RequestParam Double airportLon) {
			List<LotInfo> lotInfos = getPatchesService.getLotInfosByIds(list);
			return GeoToolsUtil.getRoutePointOrder(lotInfos, airportLat, airportLon);
			}

			@PostMapping("/patchesToWayline")
			public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
			public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
			@RequestParam String waylineName,
			@RequestParam String workspaceId,
			@RequestParam(required = false) String patchesId,
			@RequestParam double lat,
			@RequestParam double lon,
			@RequestParam(defaultValue = "1", required = false) String isTemp,
			HttpServletRequest request) throws IOException {
			CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
			String creator = customClaim.getUsername();
			MultipartFile file = timerUtil.getFile(waylineName, list);
			waylineFileService.importKmzFileBack(file, workspaceId, creator);
			MultipartFile file = timerUtil.getFile(waylineName, lotInfos, lat, lon);
			waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, isTemp);
			WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
			Map<String, String> infoMap = new HashMap<>();
			URL url = null;
			@@ -152,13 +169,13 @@
			@GetMapping("/useMyTask")
			public ResponseResult useMyTask() throws Exception {
			try {
			// timerUtil.myTask();
			// TimerUtil.mytask10();
			// timerUtil.myTask2();
			// timerUtil.myTask3();
			timerUtil.mytask4();
			timerUtil.mytask5();
			timerUtil.mytask6();
			timerUtil.mytask7();
			// timerUtil.mytask4();
			// timerUtil.mytask5();
			// timerUtil.mytask6();
			// timerUtil.mytask7();

			} catch (Exception e) {
			throw new RuntimeException("db存储发送出现异常" + e);
			@@ -166,20 +183,21 @@
			return ResponseResult.success();
			}

			@GetMapping ("/tests")
			public ResponseResult use() {
			ExecutorService executor = Executors.newSingleThreadExecutor();
			executor.execute(() -> {
			try {
			timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
			"635148ea-0ddb-4b23-945c-8a67abd813c9");
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			});
			executor.shutdown();
			return ResponseResult.success();
			@GetMapping("/tests")
			public ResponseResult use() {
			ExecutorService executor = Executors.newSingleThreadExecutor();
			executor.execute(() -> {
			try {
			timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
			"635148ea-0ddb-4b23-945c-8a67abd813c9");
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			});
			executor.shutdown();
			return ResponseResult.success();
			}

			@PostMapping("/way")
			public void getway(@RequestParam("file") MultipartFile file,
			@RequestParam String workspaceId,
			@@ -204,7 +222,6 @@
			@RequestParam String dkbh) {

			try {
			fileService.getNoaddFile();
			PatchesParam param = PatchesParam.builder()
			.page(page)
			.workspaceId(workspaceId)
			@@ -236,9 +253,9 @@
			@RequestParam double airportLat,
			@RequestParam double airportLon,
			HttpServletRequest request) throws Exception {
			MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
			CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
			String creator = customClaim.getUsername();
			MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon, creator);
			waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
			WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
			Map<String, String> infoMap = new HashMap<>();