From 36e5b1a2e89077e20c35764356a1f70798142a08 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 06 Jun 2024 14:47:11 +0800
Subject: [PATCH] 完善图斑调查取证模块信息
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 c5aa58c..be8f7cb 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -11,6 +11,7 @@
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;
@@ -55,7 +56,12 @@
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 = "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 = "xmc", defaultValue = "") String xmc,
+ @RequestParam(name = "investigate", required = false) Integer investigate
) {
//调用service分页查询
PatchesParam param = PatchesParam.builder()
@@ -63,8 +69,12 @@
.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,11 +91,21 @@
return ResponseResult.success();
}
+ @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("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
-// timerUtil.myTask();
- timerUtil.myTask2();
+ timerUtil.myTask();
+// timerUtil.myTask2();
return ResponseResult.success();
} catch (Exception e) {
throw new RuntimeException("db存储发送出现异常");
--
Gitblit v1.9.3