From 35cb086a6e05bf0b6e2a6831330fbcd2c740eba7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 01 Apr 2024 20:44:21 +0800
Subject: [PATCH] 修改workspaceId
---
src/main/java/com/dji/sample/patches/controller/GetPatchesController.java | 8 ++++----
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 2 +-
src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java | 2 +-
src/main/java/com/dji/sample/patches/model/entity/LotInfo.java | 4 ++--
src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java | 6 +++---
src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java | 4 ++--
src/main/java/com/dji/sample/summarize/service/SummarizeService.java | 2 +-
src/main/java/com/dji/sample/summarize/controller/SummarizeController.java | 6 +++---
src/main/java/com/dji/sample/patches/controller/ShpToDataSourceController.java | 4 ++--
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 4 ++--
10 files changed, 21 insertions(+), 21 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 94ef34d..5ca7a73 100644
--- a/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
@@ -20,11 +20,11 @@
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
- @RequestParam String itemId) {
+ @RequestParam String workspaceId) {
//调用service分页查询
PatchesParam param=PatchesParam.builder()
.page(page)
- .itemId(itemId)
+ .workspaceId(workspaceId)
.pageSize(pageSize).build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
@@ -39,11 +39,11 @@
@GetMapping("/GetPhoto")
public ResponseResult<PaginationData<MediaFileEntity>> GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
- @RequestParam String itemId,
+ @RequestParam String workspaceId,
@RequestParam String dkbh){
PatchesParam param=PatchesParam.builder()
.page(page)
- .itemId(itemId)
+ .workspaceId(workspaceId)
.pageSize(pageSize).build();
getPatchesService.getPhoto(param,dkbh);
return ResponseResult.success(getPatchesService.getPhoto(param,dkbh));
diff --git a/src/main/java/com/dji/sample/patches/controller/ShpToDataSourceController.java b/src/main/java/com/dji/sample/patches/controller/ShpToDataSourceController.java
index 63c442d..3ee3772 100644
--- a/src/main/java/com/dji/sample/patches/controller/ShpToDataSourceController.java
+++ b/src/main/java/com/dji/sample/patches/controller/ShpToDataSourceController.java
@@ -17,8 +17,8 @@
@Autowired
private ShpToDataSourceServiceImpl shpToDataSourceServiceImpl;
@PostMapping("/getGeo")
- public ResponseResult<List<LotInfo>> getGeo (@RequestParam("file") MultipartFile file,@RequestParam String itemId) throws IOException {
- List<LotInfo> list=shpToDataSourceServiceImpl.insertGeo(file,itemId);
+ public ResponseResult<List<LotInfo>> getGeo (@RequestParam("file") MultipartFile file,@RequestParam String workspaceId) throws IOException {
+ List<LotInfo> list=shpToDataSourceServiceImpl.insertGeo(file,workspaceId);
return ResponseResult.success(list);
}
diff --git a/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java b/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java
index 612cee1..d0f9a93 100644
--- a/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java
+++ b/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java
@@ -16,5 +16,5 @@
@Builder.Default
private int pageSize = 10;
- private String itemId;
+ private String workspaceId;
}
diff --git a/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
index 60dcb9d..96eaa7d 100644
--- a/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
+++ b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
@@ -18,8 +18,8 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @TableField("item_id")
- private String itemId;
+ @TableField("workspace_id")
+ private String workspaceId;
@TableField("bsm")
private String bsm;
diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index 45cf724..df577ca 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -28,7 +28,7 @@
public PaginationData<LotInfo> limitGet(PatchesParam param) {
Page<LotInfo> page = mapper.selectPage(new Page<LotInfo>(param.getPage(), param.getPageSize()),
new LambdaQueryWrapper<LotInfo>()
- .eq(LotInfo::getItemId,param.getItemId()));
+ .eq(LotInfo::getWorkspaceId,param.getWorkspaceId()));
List<LotInfo> records = page.getRecords()
.stream()
.collect(Collectors.toList());
diff --git a/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
index 783155b..30cccc9 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
@@ -24,7 +24,7 @@
private ShpToDataSourceMapper mapper;
String head = POLYGON;
String json;
- public List<LotInfo> insertGeo(MultipartFile file ,String itemId) throws IOException {
+ public List<LotInfo> insertGeo(MultipartFile file ,String workspaceId) throws IOException {
List<LotInfo> list=new ArrayList<>();
MultipartFileTOFileUtil multipartFileTOFileUtil = new MultipartFileTOFileUtil();
File file1 = multipartFileTOFileUtil.multipartFile2File(file);
@@ -38,7 +38,7 @@
String uuid = UUID.randomUUID().toString();
String bsm = uuid.replaceAll("-", "");
lotInfo.setBsm(bsm);
- lotInfo.setItemId(itemId);
+ lotInfo.setWorkspaceId(workspaceId);
lotInfo.setDkfw(json);
lotInfo.setDkbh("dkbh"+i);
mapper.insert(lotInfo);
diff --git a/src/main/java/com/dji/sample/summarize/controller/SummarizeController.java b/src/main/java/com/dji/sample/summarize/controller/SummarizeController.java
index 8bf4aa3..55069a8 100644
--- a/src/main/java/com/dji/sample/summarize/controller/SummarizeController.java
+++ b/src/main/java/com/dji/sample/summarize/controller/SummarizeController.java
@@ -12,15 +12,15 @@
@Autowired
private SummarizeService summarizeService;
@GetMapping("/getSummarize")
- public ResponseResult<FlyInfo> getSummarize(@RequestParam String itemId){
- FlyInfo summarize=summarizeService.findData(itemId);
+ public ResponseResult<FlyInfo> getSummarize(@RequestParam String workspaceId){
+ FlyInfo summarize=summarizeService.findData(workspaceId);
return ResponseResult.success(summarize);
}
@PutMapping("/upSummarize")
public ResponseResult upSummarize(@RequestBody FlyInfo summarize){
FlyInfo flyInfo= FlyInfo.builder()
.id(summarize.getId())
- .itemId(summarize.getItemId())
+ .workspaceId(summarize.getWorkspaceId())
.hour(summarize.getHour())
.min(summarize.getMin())
.flyCount(summarize.getFlyCount())
diff --git a/src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java b/src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java
index ec33f2d..7439689 100644
--- a/src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java
+++ b/src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java
@@ -19,8 +19,8 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @TableField("item_id")
- private String itemId;
+ @TableField("workspace_id")
+ private String workspaceId;
@TableField("hour")
private String hour;
diff --git a/src/main/java/com/dji/sample/summarize/service/SummarizeService.java b/src/main/java/com/dji/sample/summarize/service/SummarizeService.java
index 3ae34a1..5e96636 100644
--- a/src/main/java/com/dji/sample/summarize/service/SummarizeService.java
+++ b/src/main/java/com/dji/sample/summarize/service/SummarizeService.java
@@ -3,6 +3,6 @@
import com.dji.sample.summarize.model.entity.FlyInfo;
public interface SummarizeService {
- FlyInfo findData(String itemId);
+ FlyInfo findData(String workspaceId);
void updateData( FlyInfo flyInfo);
}
diff --git a/src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java b/src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java
index 40a095a..116c15c 100644
--- a/src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java
+++ b/src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java
@@ -14,14 +14,14 @@
private SummarizeMapper mapper;
@Override
- public FlyInfo findData(String itemId) {
- return mapper.selectOne(new LambdaQueryWrapper<FlyInfo>().eq(FlyInfo::getItemId,itemId));
+ public FlyInfo findData(String workspaceId) {
+ return mapper.selectOne(new LambdaQueryWrapper<FlyInfo>().eq(FlyInfo::getWorkspaceId,workspaceId));
}
@Override
public void updateData(FlyInfo flyInfo) {
mapper.update(flyInfo, new LambdaQueryWrapper<FlyInfo>()
- .eq(FlyInfo::getItemId, flyInfo.getItemId()));
+ .eq(FlyInfo::getWorkspaceId, flyInfo.getWorkspaceId()));
}
}
--
Gitblit v1.9.3