From 3904fbdccb96a9b1b4f919d18505d5ebb8ef976a Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 20 Jun 2024 18:13:18 +0800
Subject: [PATCH] 定时九洲巡查
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 12 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 bd2103f..5860f0b 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -11,15 +11,18 @@
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.TimerUtil;
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.web.bind.annotation.*;
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;
@@ -38,6 +41,8 @@
@Autowired
private IWaylineFileService waylineFileService;
@Autowired
+ private IWaylineJobService waylineJobService;
+ @Autowired
private TbDkjbxxServiceImpl tbDkjbxxService;
@Autowired
private TimerUtil timerUtil;
@@ -51,14 +56,14 @@
* @return
*/
@GetMapping("/listPatches")
- @SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
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()
@@ -66,9 +71,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);
@@ -81,20 +87,93 @@
* @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")
+ public ResponseResult xzq(@RequestParam String code) {
+ 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.myTask2();
- return ResponseResult.success();
+// timerUtil.myTask2();
+// timerUtil.myTask3();
+ timerUtil.mytask4();
+
} catch (Exception e) {
- throw new RuntimeException("db存储发送出现异常");
+ throw new RuntimeException("db存储发送出现异常" + e);
}
+ return ResponseResult.success();
+ }
+
+ // @GetMapping ("/tests")
+// public ResponseResult use() {
+// try {
+// TimerUtil.sendPostWithFileAndParameter("src/main/resources/tmp/20240613/205621_635148ea-0ddb-4b23-945c-8a67abd813c9.db",
+// "635148ea-0ddb-4b23-945c-8a67abd813c9");
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// 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);
}
/**
--
Gitblit v1.9.3