From d016b04e9beb8d1cb039188dd979d8805d9aa394 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Apr 2024 16:31:28 +0800
Subject: [PATCH] Waylinefile新增根据ID修改文件名称，workspace新增根据id查找信息
---
src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java | 13 +++++++++++++
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java | 5 +++++
src/main/java/com/dji/sample/manage/service/IWorkspaceService.java | 3 +++
src/main/java/com/dji/sample/manage/controller/WorkspaceController.java | 4 ++++
src/main/java/com/dji/sample/manage/service/impl/WorkspaceServiceImpl.java | 6 ++++++
src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java | 3 +++
6 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java b/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java
index 2a424f8..9678853 100644
--- a/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java
+++ b/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java
@@ -60,5 +60,9 @@
public ResponseResult update(@RequestBody WorkspaceDTO dto) {
return workspaceService.updateWorkspaceById(dto)?ResponseResult.success():ResponseResult.error();
}
+ @GetMapping("/selectById")
+ public ResponseResult selectById(@RequestParam int id){
+ return ResponseResult.success(workspaceService.getWorkspaceById(id));
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/dji/sample/manage/service/IWorkspaceService.java b/src/main/java/com/dji/sample/manage/service/IWorkspaceService.java
index 7b8db65..00948e0 100644
--- a/src/main/java/com/dji/sample/manage/service/IWorkspaceService.java
+++ b/src/main/java/com/dji/sample/manage/service/IWorkspaceService.java
@@ -5,6 +5,7 @@
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
import com.dji.sample.manage.model.dto.WorkspaceDTO;
+import com.dji.sample.manage.model.entity.WorkspaceEntity;
import org.springframework.messaging.MessageHeaders;
import java.util.Optional;
@@ -38,4 +39,6 @@
* @param receiver
*/
void replyOrganizationGet(CommonTopicReceiver receiver, MessageHeaders headers);
+
+ WorkspaceEntity getWorkspaceById(int id);
}
diff --git a/src/main/java/com/dji/sample/manage/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/WorkspaceServiceImpl.java
index c75c135..3b19e78 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/WorkspaceServiceImpl.java
@@ -113,6 +113,12 @@
messageSenderService.publish(topic, builder.build());
}
+ @Override
+ public WorkspaceEntity getWorkspaceById(int id) {
+ WorkspaceEntity entity=mapper.selectById(id);
+ return entity;
+ }
+
/**
* Convert database entity objects into workspace data transfer object.
* @param entity
diff --git a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
index 5ceaab9..35c12e6 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java
@@ -8,6 +8,7 @@
import com.dji.sample.wayline.model.dto.WaylineFileDTO;
import com.dji.sample.wayline.model.dto.WaylineFileUploadDTO;
import com.dji.sample.wayline.model.dto.WaylineListDTO;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.model.param.WaylineQueryParam;
import com.dji.sample.wayline.service.IWaylineFileService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -209,4 +210,16 @@
public ResponseResult<List<WaylineListDTO>> waylineList(@PathVariable(name = "workspace_id") String workspaceId,String droneName) {
return ResponseResult.success(waylineFileService.waylineList(workspaceId,droneName)) ;
}
+
+ @PutMapping("/{workspace_id}/wayline_update")
+ public ResponseResult upWayline(@RequestParam String waylineId,@RequestParam String name){
+ WaylineFileEntity entity=WaylineFileEntity
+ .builder()
+ .waylineId(waylineId)
+ .name(name)
+ .build();
+ if(waylineFileService.updateWayline(entity)==0){
+ return ResponseResult.error("更新失败");
+ }else return ResponseResult.success();
+ }
}
diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
index 6a37797..b1fb293 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineFileService.java
@@ -3,6 +3,7 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.wayline.model.dto.WaylineFileDTO;
import com.dji.sample.wayline.model.dto.WaylineListDTO;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.model.param.WaylineQueryParam;
import org.springframework.web.multipart.MultipartFile;
@@ -84,4 +85,6 @@
void importKmzFile(MultipartFile file, String workspaceId, String creator);
List<WaylineListDTO> waylineList(String workspaceId,String droneName);
+
+ int updateWayline(WaylineFileEntity entity);
}
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
index bbeee6f..a90846f 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
@@ -299,4 +299,9 @@
return builder.build();
}
+ @Override
+ public int updateWayline(WaylineFileEntity entity) {
+ return mapper.update(entity,new LambdaQueryWrapper<WaylineFileEntity>()
+ .eq(WaylineFileEntity::getWaylineId,entity.getWaylineId()));
+ }
}
--
Gitblit v1.9.3