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, 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); } } 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> { } 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> { } src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
File was renamed from src/main/java/com/dji/sample/patches/model/entity/PatchesEntity.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; 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); } 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)); } } 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);