From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 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 1d496f8..d07dab3 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -21,6 +21,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.net.URL;
import java.sql.SQLException;
import java.util.HashMap;
@@ -56,10 +57,11 @@
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
- @RequestParam(name = "dkbh", defaultValue = "") String dkbh,
- @RequestParam(name = "isPlan", required = false) Integer isPlan,
- @RequestParam(name = "xzqdm", defaultValue = "") String xzqdm,
- @RequestParam(name = "bsm", defaultValue = "") String bsm
+ @RequestParam(name = "dkbh", required = false) String dkbh,
+ @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
) {
//调用service分页查询
PatchesParam param = PatchesParam.builder()
@@ -67,9 +69,10 @@
.workspaceId(workspaceId)
.pageSize(pageSize)
.dkbh(dkbh)
- .isPlan(isPlan)
.xzqdm(xzqdm)
.bsm(bsm)
+ .xmc(xmc)
+ .investigate(investigate)
.build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
@@ -82,9 +85,17 @@
* @return 返回操作结果，如果操作成功，则返回一个成功的响应结果。
*/
@DeleteMapping("/deletePatches")
- public ResponseResult del() {
- getPatchesService.delPatches();
- return ResponseResult.success();
+ public ResponseResult del(String workspaceId) {
+ int count=getPatchesService.delPatches(workspaceId);
+ return ResponseResult.success("删除的图斑数量是"+count);
+ }
+ @DeleteMapping("/deleteOne")
+ public ResponseResult deleteOne(int id){
+ int count= getPatchesService.deleteOne(id);
+ if (count!=0){
+ return ResponseResult.success("图斑删除成功id为"+id);
+ }
+ return ResponseResult.error("图斑删除失败");
}
@GetMapping("/getXzq")
@@ -92,17 +103,62 @@
String xzq = DistrictCodeUtils.nameToCode(code);
return ResponseResult.success(xzq);
}
+ @GetMapping("/getInfoById")
+ public ResponseResult<LotInfo> wayAndPatchesId(@RequestParam String patchesId) {
+ return ResponseResult.success(getPatchesService.getPatchesFromId(patchesId));
+ }
+ @GetMapping("/getWayline")
+ public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list){
+ try {
+ MultipartFile file=timerUtil.getFile(waylineName,list);
+ return ResponseResult.success(file);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @PostMapping("/patchesToWayline")
+ public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
+ @RequestParam String waylineName,
+ @RequestParam String workspaceId,
+ 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);
+ WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
+ Map<String, String> infoMap = new HashMap<>();
+ URL url = null;
+ try {
+ url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
+ infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
+ infoMap.put("waylineId", entity.getWaylineId());
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ return ResponseResult.success(infoMap);
+ }
@GetMapping("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
- timerUtil.myTask();
+// timerUtil.myTask();
timerUtil.myTask2();
return ResponseResult.success();
} catch (Exception e) {
- throw new RuntimeException("db存储发送出现异常");
+ throw new RuntimeException("db存储发送出现异常"+e);
}
}
+ @GetMapping ("/tests")
+ public ResponseResult use() {
+ try {
+ TimerUtil.sendPostWithFileAndParameter("DB/result_db.db",
+ "635148ea-0ddb-4b23-945c-8a67abd813c9");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return ResponseResult.success();
+ }
/**
* 根据图斑的地块编号获取相对应音视频
--
Gitblit v1.9.3