From c1915a7e947710572826a746e975e8d09516a0e7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Apr 2024 16:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/controller/GetPatchesController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java b/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
index 5eb5999..5ca7a73 100644
--- a/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
@@ -3,14 +3,13 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.log.aspect.SysLogAnnotation;
+import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.model.Param.PatchesParam;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
@RequestMapping("${url.patches.prefix}${url.patches.version}")
@RestController
public class GetPatchesController {
@@ -19,13 +18,34 @@
@GetMapping("/getPatches")
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
- public ResponseResult<PaginationData<PatchesEntity>> page(@RequestParam Integer page,
- @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize) {
+ public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
+ @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
+ @RequestParam String workspaceId) {
//调用service分页查询
PatchesParam param=PatchesParam.builder()
.page(page)
+ .workspaceId(workspaceId)
.pageSize(pageSize).build();
- PaginationData<PatchesEntity> data = getPatchesService.limitGet(param);
+ PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
}
+
+ @DeleteMapping("/delPatches")
+ public ResponseResult del(){
+ getPatchesService.delPatches();
+ return ResponseResult.success();
+ }
+
+ @GetMapping("/GetPhoto")
+ public ResponseResult<PaginationData<MediaFileEntity>> GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
+ @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
+ @RequestParam String workspaceId,
+ @RequestParam String dkbh){
+ PatchesParam param=PatchesParam.builder()
+ .page(page)
+ .workspaceId(workspaceId)
+ .pageSize(pageSize).build();
+ getPatchesService.getPhoto(param,dkbh);
+ return ResponseResult.success(getPatchesService.getPhoto(param,dkbh));
+ }
}
--
Gitblit v1.9.3