From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 155 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 136 insertions(+), 19 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 2167075..d07dab3 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -8,10 +8,12 @@
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
-//import com.dji.sample.patches.service.DbFileService;
-import com.dji.sample.patches.service.DbFileService;
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 org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +21,11 @@
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;
+import java.util.List;
import java.util.Map;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -32,37 +36,139 @@
@Autowired
private GetPatchesService getPatchesService;
@Autowired
- private ShpToDataSourceServiceImpl shpToDataSourceServiceImpl;
+ private ShpToDataSourceService shpToDataSourceService;
@Autowired
private IWaylineFileService waylineFileService;
@Autowired
- private DbFileService dbFileService;
- //获取图斑信息
+ private TbDkjbxxServiceImpl tbDkjbxxService;
+ @Autowired
+ private TimerUtil timerUtil;
+
+ /**
+ * 根据workspaceId获取图斑列表信息
+ *
+ * @param page
+ * @param pageSize
+ * @param workspaceId
+ * @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 String workspaceId,
+ @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()
.page(page)
.workspaceId(workspaceId)
- .pageSize(pageSize).build();
+ .pageSize(pageSize)
+ .dkbh(dkbh)
+ .xzqdm(xzqdm)
+ .bsm(bsm)
+ .xmc(xmc)
+ .investigate(investigate)
+ .build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
}
- //清空图斑文件
+
+ /**
+ * 删除图斑信息
+ * 本接口不需要接收任何参数，调用成功后会删除相应的补丁信息。
+ *
+ * @return 返回操作结果，如果操作成功，则返回一个成功的响应结果。
+ */
@DeleteMapping("/deletePatches")
- public ResponseResult del() {
- getPatchesService.delPatches();
+ 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();
+ } catch (Exception e) {
+ throw new RuntimeException("db存储发送出现异常"+e);
+ }
+ }
+ @GetMapping ("/tests")
+ public ResponseResult use() {
+ try {
+ TimerUtil.sendPostWithFileAndParameter("DB/result_db.db",
+ "635148ea-0ddb-4b23-945c-8a67abd813c9");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return ResponseResult.success();
}
- @GetMapping("/dbFile")
- public ResponseResult dbfile(){
- dbFileService.importDataFromSQLiteToMySQL();
- return ResponseResult.success();
- }
- //根据dkbh获取图斑图片
+
+ /**
+ * 根据图斑的地块编号获取相对应音视频
+ *
+ * @param page
+ * @param pageSize
+ * @param workspaceId
+ * @param dkbh
+ * @return
+ */
@GetMapping("/listPhoto")
public ResponseResult<PaginationData<MediaFileEntity>> GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@@ -80,7 +186,19 @@
return ResponseResult.error("未匹配到相关图片"); // 返回错误信息，可以根据实际情况自定义
}
}
- //上传图斑文件并返回航线
+
+ /**
+ * 上传图斑文件，解析文件并入库，再生成航线并返回
+ *
+ * @param file
+ * @param workspaceId
+ * @param waylineName
+ * @param airportLat
+ * @param airportLon
+ * @param request
+ * @return
+ * @throws Exception
+ */
@PostMapping("/uploadLot")
public ResponseResult getGeo(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
@@ -88,7 +206,7 @@
@RequestParam double airportLat,
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
- MultipartFile multipartFile = shpToDataSourceServiceImpl.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
+ MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
@@ -103,6 +221,5 @@
throw new RuntimeException(e);
}
return ResponseResult.success(infoMap);
-// return ResponseResult.success(MinioUrlUtils.getUrl(url));
}
}
--
Gitblit v1.9.3