From 6322f4c190dc9b41572e59e671dd3ecc005253b9 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 27 Mar 2024 10:03:04 +0800
Subject: [PATCH] 图斑
---
src/main/java/com/dji/sample/patches/controller/GetPatchesController.java | 8 ++++----
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 10 +++++-----
src/main/java/com/dji/sample/patches/dao/GetPatchesMapper.java | 4 ++--
src/main/java/com/dji/sample/patches/model/entity/LotInfo.java | 4 +---
src/main/java/com/dji/sample/patches/service/GetPatchesService.java | 4 ++--
src/main/java/com/dji/sample/patches/dao/ShpToDataSourceMapper.java | 4 ++--
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 4 ++--
7 files changed, 18 insertions(+), 20 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 5eb5999..d854932 100644
--- a/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/GetPatchesController.java
@@ -4,7 +4,7 @@
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.patches.model.Param.PatchesParam;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,13 +19,13 @@
@GetMapping("/getPatches")
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
- public ResponseResult<PaginationData<PatchesEntity>> page(@RequestParam Integer page,
- @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize) {
+ public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
+ @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize) {
//调用service分页查询
PatchesParam param=PatchesParam.builder()
.page(page)
.pageSize(pageSize).build();
- PaginationData<PatchesEntity> data = getPatchesService.limitGet(param);
+ PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
}
}
diff --git a/src/main/java/com/dji/sample/patches/dao/GetPatchesMapper.java b/src/main/java/com/dji/sample/patches/dao/GetPatchesMapper.java
index ac2e428..4bf30bb 100644
--- a/src/main/java/com/dji/sample/patches/dao/GetPatchesMapper.java
+++ b/src/main/java/com/dji/sample/patches/dao/GetPatchesMapper.java
@@ -1,10 +1,10 @@
package com.dji.sample.patches.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
import org.apache.ibatis.annotations.Mapper;
@Mapper
-public interface GetPatchesMapper extends BaseMapper<PatchesEntity> {
+public interface GetPatchesMapper extends BaseMapper<LotInfo> {
}
diff --git a/src/main/java/com/dji/sample/patches/dao/ShpToDataSourceMapper.java b/src/main/java/com/dji/sample/patches/dao/ShpToDataSourceMapper.java
index af434c0..aeb13f8 100644
--- a/src/main/java/com/dji/sample/patches/dao/ShpToDataSourceMapper.java
+++ b/src/main/java/com/dji/sample/patches/dao/ShpToDataSourceMapper.java
@@ -1,11 +1,11 @@
package com.dji.sample.patches.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
import org.apache.ibatis.annotations.Mapper;
@Mapper
-public interface ShpToDataSourceMapper extends BaseMapper<PatchesEntity> {
+public interface ShpToDataSourceMapper extends BaseMapper<LotInfo> {
}
diff --git a/src/main/java/com/dji/sample/patches/model/entity/PatchesEntity.java b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
similarity index 89%
rename from src/main/java/com/dji/sample/patches/model/entity/PatchesEntity.java
rename to src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
index df21fcf..fc225a2 100644
--- a/src/main/java/com/dji/sample/patches/model/entity/PatchesEntity.java
+++ b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
@@ -1,20 +1,18 @@
package com.dji.sample.patches.model.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
-import java.time.LocalDateTime;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "tb_lot_info")
-public class PatchesEntity implements Serializable {
+public class LotInfo implements Serializable {
@TableId(type = IdType.AUTO)
private Integer id;
diff --git a/src/main/java/com/dji/sample/patches/service/GetPatchesService.java b/src/main/java/com/dji/sample/patches/service/GetPatchesService.java
index d370056..da28115 100644
--- a/src/main/java/com/dji/sample/patches/service/GetPatchesService.java
+++ b/src/main/java/com/dji/sample/patches/service/GetPatchesService.java
@@ -2,8 +2,8 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.patches.model.Param.PatchesParam;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
public interface GetPatchesService {
- PaginationData<PatchesEntity> limitGet(PatchesParam param);
+ PaginationData<LotInfo> limitGet(PatchesParam param);
}
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 e2c41a3..a1a294a 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
@@ -5,7 +5,7 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.Param.PatchesParam;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,12 +19,12 @@
private GetPatchesMapper mapper;
@Override
- public PaginationData<PatchesEntity> limitGet(PatchesParam param) {
- Page<PatchesEntity> page = mapper.selectPage(new Page<PatchesEntity>(param.getPage(), param.getPageSize()), null);
- List<PatchesEntity> records = page.getRecords()
+ public PaginationData<LotInfo> limitGet(PatchesParam param) {
+ Page<LotInfo> page = mapper.selectPage(new Page<LotInfo>(param.getPage(), param.getPageSize()), null);
+ List<LotInfo> records = page.getRecords()
.stream()
.collect(Collectors.toList());
- return new PaginationData<PatchesEntity>(records, new Pagination(page));
+ return new PaginationData<LotInfo>(records, new Pagination(page));
}
}
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 eda379b..95fbed6 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
@@ -1,7 +1,7 @@
package com.dji.sample.patches.service.impl;
import com.dji.sample.patches.dao.ShpToDataSourceMapper;
-import com.dji.sample.patches.model.entity.PatchesEntity;
+import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.ShpToDataSourceService;
import com.dji.sample.patches.utils.FormatConversionUtil;
import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
@@ -28,7 +28,7 @@
String json;
public void insertGeo(MultipartFile file) throws IOException {
- PatchesEntity patches = new PatchesEntity();
+ LotInfo patches = new LotInfo();
MultipartFileTOFileUtil multipartFileTOFileUtil = new MultipartFileTOFileUtil();
File file1 = multipartFileTOFileUtil.multipartFile2File(file);
List<String> s = ShapeFileUtil.shpToGeoJson(file1);
--
Gitblit v1.9.3