From 6c321434d8f0bc78ae86640653eccbf4cfc2c1d3 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 11 Jun 2024 09:10:13 +0800
Subject: [PATCH] SM3加密，媒体文件存储
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 9 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 e2a21fe..6ab99e4 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,8 @@
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;
@@ -19,6 +21,7 @@
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;
@@ -38,6 +41,8 @@
private IWaylineFileService waylineFileService;
@Autowired
private TbDkjbxxServiceImpl tbDkjbxxService;
+ @Autowired
+ private TimerUtil timerUtil;
/**
* 根据workspaceId获取图斑列表信息
@@ -51,12 +56,24 @@
@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);
}
@@ -68,8 +85,69 @@
* @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));
+ }
+
+ @PostMapping("/patchesToWayline")
+ public ResponseResult patchesToWayline(List<LotInfo> list,
+ String waylineName,
+ 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存储发送出现异常");
+ }
+ }
+ @GetMapping ("/tests")
+ public ResponseResult use() {
+ try {
+ TimerUtil.sendPostWithFileAndParameter("src/main/resources/tmp/20240607/103145_635148ea-0ddb-4b23-945c-8a67abd813c9.db",
+ "635148ea-0ddb-4b23-945c-8a67abd813c9");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return ResponseResult.success();
}
@@ -134,10 +212,5 @@
throw new RuntimeException(e);
}
return ResponseResult.success(infoMap);
- }
- @PostMapping("/test")
- public void test(){
- List<LotInfo> list=getPatchesService.listLotinfo();
- tbDkjbxxService.insert(list);
}
}
--
Gitblit v1.9.3