From 08f58c4a65fc6cbdb530ecac9153b3904763d8b6 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 11:45:12 +0800
Subject: [PATCH] 图斑
---
src/main/java/com/dji/sample/patches/service/impl/PatchesServiceImpl.java | 7 +++++--
src/main/java/com/dji/sample/patches/dao/PatchesMapper.java | 6 ++++--
src/main/java/com/dji/sample/patches/model/PatchesEntity.java | 6 ++++--
src/main/java/com/dji/sample/patches/service/PatchesService.java | 7 +++++--
src/main/resources/application-dev.yml | 2 +-
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 7 +++++--
6 files changed, 24 insertions(+), 11 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 5a2f11e..058fac3 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -2,12 +2,15 @@
import com.dji.sample.patches.model.PageBean;
import com.dji.sample.patches.service.impl.PatchesServiceImpl;
-import org.opengis.geometry.coordinate.Polygon;
+import org.locationtech.jts.geom.Geometry;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.geo.Polygon;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Array;
@RequestMapping("${url.patches.prefix}${url.patches.version}")
@RestController
@@ -17,7 +20,7 @@
@GetMapping("/getPatches")
public PageBean page(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "5") Integer pageSize,
- Integer id, String bsm, Polygon dkfw, String dklx){
+ Integer id, String bsm, String dkfw, String dklx){
//调用service分页查询
PageBean pageBean =patchesServiceimpl.limitGet( id, bsm, dkfw, dklx, page, pageSize);
return pageBean;
diff --git a/src/main/java/com/dji/sample/patches/dao/PatchesMapper.java b/src/main/java/com/dji/sample/patches/dao/PatchesMapper.java
index 2dedf27..20a1c13 100644
--- a/src/main/java/com/dji/sample/patches/dao/PatchesMapper.java
+++ b/src/main/java/com/dji/sample/patches/dao/PatchesMapper.java
@@ -3,12 +3,14 @@
import com.dji.sample.patches.model.PatchesEntity;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import org.opengis.geometry.coordinate.Polygon;
+import org.locationtech.jts.geom.Geometry;
+import org.springframework.data.geo.Polygon;
+import java.sql.Array;
import java.util.List;
public interface PatchesMapper {
@Select("select id ,bsm,dkfw ,dklx from tb_lot_info")
List<PatchesEntity> limitGet(@Param("id") Integer id, @Param("bsm") String bsm,
- @Param("dkfw") Polygon dkfw,@Param("dklx") String dklx);
+ @Param("dkfw") String dkfw, @Param("dklx") String dklx);
}
diff --git a/src/main/java/com/dji/sample/patches/model/PatchesEntity.java b/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
index a32ede2..5a010e4 100644
--- a/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
+++ b/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
@@ -6,10 +6,12 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.opengis.geometry.coordinate.Polygon;
+import org.locationtech.jts.geom.Polygon;
+import java.awt.*;
import java.io.Serializable;
+import java.sql.Array;
import java.time.LocalDateTime;
@Data
@@ -59,7 +61,7 @@
private String kzxx;
@TableField("dkfw")
- private Polygon dkfw;
+ private String dkfw;
@TableField("sjlx")
private String sjlx;
diff --git a/src/main/java/com/dji/sample/patches/service/PatchesService.java b/src/main/java/com/dji/sample/patches/service/PatchesService.java
index c70d5e4..aaea7c0 100644
--- a/src/main/java/com/dji/sample/patches/service/PatchesService.java
+++ b/src/main/java/com/dji/sample/patches/service/PatchesService.java
@@ -1,8 +1,11 @@
package com.dji.sample.patches.service;
import com.dji.sample.patches.model.PageBean;
-import org.opengis.geometry.coordinate.Polygon;
+import org.locationtech.jts.geom.Geometry;
+import org.springframework.data.geo.Polygon;
+
+import java.sql.Array;
public interface PatchesService {
- PageBean limitGet (Integer id,String bsm, Polygon dkfw ,String dklx,int page, int pageSize);
+ PageBean limitGet (Integer id, String bsm, String dkfw , String dklx, int page, int pageSize);
}
diff --git a/src/main/java/com/dji/sample/patches/service/impl/PatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/PatchesServiceImpl.java
index 63df1ff..f9a9f6f 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/PatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/PatchesServiceImpl.java
@@ -6,10 +6,13 @@
import com.dji.sample.patches.service.PatchesService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
-import org.opengis.geometry.coordinate.Polygon;
+import lombok.NoArgsConstructor;
+import org.locationtech.jts.geom.Geometry;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.geo.Polygon;
import org.springframework.stereotype.Service;
+import java.sql.Array;
import java.util.List;
@Service
public class PatchesServiceImpl implements PatchesService {
@@ -17,7 +20,7 @@
private PatchesMapper mapper;
@Override
- public PageBean limitGet(Integer id, String bsm, Polygon dkfw, String dklx, int page, int pageSize) {
+ public PageBean limitGet(Integer id, String bsm, String dkfw, String dklx, int page, int pageSize) {
//1. 设置分页参数
PageHelper.startPage(page,pageSize);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ac8e37a..9985412 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
#spring
spring:
datasource:
- url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useUnicode=true&characterEncoding=utf8mb4
username: root
password: yshb@123
--
Gitblit v1.9.3