From 360af284c3656f9f3df16f0dcda36a0d25453b18 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:35 +0800
Subject: [PATCH] 机场设备和无人机设备推送，图片、文件上传类型区分举证、航点和航测
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/PatchesController.java b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
index da5a457..15deb45 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -10,19 +10,21 @@
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.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.patches.utils.*;
import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.service.IWaylineFileService;
import com.dji.sample.wayline.service.IWaylineJobService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URL;
import java.sql.SQLException;
@@ -68,8 +70,10 @@
@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 = "isPush",required = false) Integer isPush
+ ) {
fileService.getNoaddFile();
//调用service分页查询
PatchesParam param = PatchesParam.builder()
@@ -81,6 +85,8 @@
.bsm(bsm)
.xmc(xmc)
.investigate(investigate)
+ .dkmj(dkmj)
+ .isPush(isPush)
.build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
@@ -139,16 +145,16 @@
@PostMapping("/patchesToWayline")
public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
@RequestParam String waylineName,
- @RequestParam String spotInFreckle,
@RequestParam String workspaceId,
- @RequestParam String patchesId,
+ @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, lotInfos, lat, lon);
- waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, spotInFreckle);
+ waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, isTemp,1);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
URL url = null;
@@ -165,14 +171,14 @@
@GetMapping("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
- TimerUtil.mytask10();
+// TimerUtil.mytask10();
// timerUtil.myTask2();
// timerUtil.myTask3();
// timerUtil.mytask4();
// timerUtil.mytask5();
// timerUtil.mytask6();
// timerUtil.mytask7();
-
+ timerUtil.GtdbOperation();
} catch (Exception e) {
throw new RuntimeException("db存储发送出现异常" + e);
}
@@ -193,14 +199,14 @@
executor.shutdown();
return ResponseResult.success();
}
-
- @PostMapping("/way")
- public void getway(@RequestParam("file") MultipartFile file,
- @RequestParam String workspaceId,
- @RequestParam String waylineName,
- @RequestParam String username) {
- waylineFileService.importKmzFileBack(file, workspaceId, username);
- }
+//
+// @PostMapping("/way")
+// public void getway(@RequestParam("file") MultipartFile file,
+// @RequestParam String workspaceId,
+// @RequestParam String waylineName,
+// @RequestParam String username) {
+// waylineFileService.importKmzFileBack(file, workspaceId, username);
+// }
/**
* 根据图斑的地块编号获取相对应音视频
@@ -249,10 +255,10 @@
@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();
- waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
+ MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon, creator);
+ waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator,1);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
URL url = null;
@@ -265,4 +271,25 @@
}
return ResponseResult.success(infoMap);
}
+
+ @GetMapping("/getExcel")
+ public ResponseEntity<byte[]> exportExcel(@RequestParam String ids) {
+// List<LotInfo> lotInfos = getPatchesService.listLotinfo(workspaceId);
+ try {
+ List<LotInfo> lotInfos = getPatchesService.getLotInfosByIDs(ids);
+ ByteArrayInputStream excelStream = ExcelUtil.exportLotInfoToExcel(lotInfos);
+ byte[] excelData = excelStream.readAllBytes();
+ excelStream.close();
+
+ HttpHeaders headers = new HttpHeaders();
+ headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=lot_info_data.xlsx");
+ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ headers.setContentLength(excelData.length);
+
+ return new ResponseEntity<>(excelData, headers, HttpStatus.OK);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return new ResponseEntity<>(("生成excel失败.").getBytes(), HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
}
--
Gitblit v1.9.3