From cbc882364d43e66e8a7d2a2256ab951994195457 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 01 Apr 2024 20:11:59 +0800
Subject: [PATCH] 概括信息模块和图斑模块修改根据itemId进行查询和修改
---
src/main/java/com/dji/sample/patches/controller/GetPatchesController.java | 6 +++++-
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 5 ++++-
src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.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 | 3 +++
src/main/java/com/dji/sample/summarize/service/impl/SummarizeServiceImpl.java | 12 +++++++++---
src/main/java/com/dji/sample/summarize/model/entity/FlyInfo.java | 3 +++
src/main/java/com/dji/sample/summarize/service/SummarizeService.java | 2 +-
src/main/java/com/dji/sample/summarize/controller/SummarizeController.java | 5 +++--
src/main/java/com/dji/sample/patches/controller/ShpToDataSourceController.java | 4 ++--
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 3 ++-
11 files changed, 35 insertions(+), 12 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 9a39412..94ef34d 100644
--- a/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
@@ -19,10 +19,12 @@
@GetMapping("/getPatches")
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
- @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize) {
+ @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
+ @RequestParam String itemId) {
//调用service分页查询
PatchesParam param=PatchesParam.builder()
.page(page)
+ .itemId(itemId)
.pageSize(pageSize).build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
@@ -37,9 +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 dkbh){
PatchesParam param=PatchesParam.builder()
.page(page)
+ .itemId(itemId)
.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 97e77af..63c442d 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) throws IOException {
- List<LotInfo> list=shpToDataSourceServiceImpl.insertGeo(file);
+ public ResponseResult<List<LotInfo>> getGeo (@RequestParam("file") MultipartFile file,@RequestParam String itemId) throws IOException {
+ List<LotInfo> list=shpToDataSourceServiceImpl.insertGeo(file,itemId);
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 d17dbe0..612cee1 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
@@ -15,4 +15,6 @@
@Builder.Default
private int pageSize = 10;
+
+ private String itemId;
}
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 1db872f..60dcb9d 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,6 +18,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @TableField("item_id")
+ private String itemId;
+
@TableField("bsm")
private String bsm;
diff --git a/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java b/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
index d819420..e1dd12e 100644
--- a/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
+++ b/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
@@ -6,5 +6,5 @@
import java.util.List;
public interface ShpToDataSourceService {
- List<LotInfo> insertGeo(MultipartFile file) throws IOException;
+ List<LotInfo> insertGeo(MultipartFile file ,String itemId) throws IOException;
}
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 3c2e22a..45cf724 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
@@ -11,6 +11,7 @@
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -25,7 +26,9 @@
@Override
public PaginationData<LotInfo> limitGet(PatchesParam param) {
- Page<LotInfo> page = mapper.selectPage(new Page<LotInfo>(param.getPage(), param.getPageSize()), null);
+ Page<LotInfo> page = mapper.selectPage(new Page<LotInfo>(param.getPage(), param.getPageSize()),
+ new LambdaQueryWrapper<LotInfo>()
+ .eq(LotInfo::getItemId,param.getItemId()));
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 4fc7f0b..783155b 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) throws IOException {
+ public List<LotInfo> insertGeo(MultipartFile file ,String itemId) throws IOException {
List<LotInfo> list=new ArrayList<>();
MultipartFileTOFileUtil multipartFileTOFileUtil = new MultipartFileTOFileUtil();
File file1 = multipartFileTOFileUtil.multipartFile2File(file);
@@ -38,6 +38,7 @@
String uuid = UUID.randomUUID().toString();
String bsm = uuid.replaceAll("-", "");
lotInfo.setBsm(bsm);
+ lotInfo.setItemId(itemId);
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 9af0e89..8bf4aa3 100644
--- a/src/main/java/com/dji/sample/summarize/controller/SummarizeController.java
+++ b/src/main/java/com/dji/sample/summarize/controller/SummarizeController.java
@@ -12,14 +12,15 @@
@Autowired
private SummarizeService summarizeService;
@GetMapping("/getSummarize")
- public ResponseResult<FlyInfo> getSummarize(){
- FlyInfo summarize=summarizeService.findData();
+ public ResponseResult<FlyInfo> getSummarize(@RequestParam String itemId){
+ FlyInfo summarize=summarizeService.findData(itemId);
return ResponseResult.success(summarize);
}
@PutMapping("/upSummarize")
public ResponseResult upSummarize(@RequestBody FlyInfo summarize){
FlyInfo flyInfo= FlyInfo.builder()
.id(summarize.getId())
+ .itemId(summarize.getItemId())
.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 f36ee69..ec33f2d 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,6 +19,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @TableField("item_id")
+ private String itemId;
+
@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 058ca83..3ae34a1 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();
+ FlyInfo findData(String itemId);
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 4045c29..40a095a 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
@@ -1,8 +1,10 @@
package com.dji.sample.summarize.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.summarize.dao.SummarizeMapper;
import com.dji.sample.summarize.model.entity.FlyInfo;
import com.dji.sample.summarize.service.SummarizeService;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,12 +12,16 @@
public class SummarizeServiceImpl implements SummarizeService {
@Autowired
private SummarizeMapper mapper;
+
@Override
- public FlyInfo findData() {
- return mapper.selectById(1);
+ public FlyInfo findData(String itemId) {
+ return mapper.selectOne(new LambdaQueryWrapper<FlyInfo>().eq(FlyInfo::getItemId,itemId));
}
@Override
public void updateData(FlyInfo flyInfo) {
- mapper.updateById(flyInfo);}
+ mapper.update(flyInfo, new LambdaQueryWrapper<FlyInfo>()
+ .eq(FlyInfo::getItemId, flyInfo.getItemId()));
+ }
+
}
--
Gitblit v1.9.3