From 3d92c321b2159983fda398d2d5a2b2b93737c84d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 16:56:05 +0800
Subject: [PATCH] 图斑
---
src/main/java/com/dji/sample/patches/service/impl/PatchesServiceImpl.java | 4 ++--
src/main/java/com/dji/sample/patches/dao/PatchesMapper.java | 9 ++-------
src/main/java/com/dji/sample/patches/model/PatchesEntity.java | 2 --
src/main/java/com/dji/sample/patches/service/PatchesService.java | 2 +-
src/main/resources/application-dev.yml | 10 +++++-----
src/main/resources/application-prod.yml | 10 +++++-----
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 6 ++----
7 files changed, 17 insertions(+), 26 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 b56413a..aa6b341 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -2,9 +2,7 @@
import com.dji.sample.patches.model.PageBean;
import com.dji.sample.patches.service.impl.PatchesServiceImpl;
-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;
@@ -20,9 +18,9 @@
@GetMapping("/getPatches")
public PageBean page(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "5") Integer pageSize,
- Integer id, String bsm, String tuban, String dklx){
+ Integer id, String dkbh, String dkfw){
//调用service分页查询
- PageBean pageBean =patchesServiceimpl.limitGet( id, bsm, tuban, dklx, page, pageSize);
+ PageBean pageBean =patchesServiceimpl.limitGet( id, dkbh, dkfw,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 84d430e..d9137b4 100644
--- a/src/main/java/com/dji/sample/patches/dao/PatchesMapper.java
+++ b/src/main/java/com/dji/sample/patches/dao/PatchesMapper.java
@@ -3,14 +3,9 @@
import com.dji.sample.patches.model.PatchesEntity;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-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,tuban ,dklx from tb_lot_info")
-List<PatchesEntity> limitGet(@Param("id") Integer id, @Param("bsm") String bsm,
- @Param("tuban") String tuban, @Param("dklx") String dklx);
+ @Select("select id ,dkbh,dkfw from tb_lot_info")
+ List<PatchesEntity> limitGet(@Param("id") Integer id, @Param("dkbh") String dkbh, @Param("dkfw") String dkfw);
}
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 fa509e5..92eb30b 100644
--- a/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
+++ b/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
@@ -61,8 +61,6 @@
@TableField("sjlx")
private String sjlx;
- @TableField("tuban")
- private String tuban;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
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 4e40d2a..fa5f3fa 100644
--- a/src/main/java/com/dji/sample/patches/service/PatchesService.java
+++ b/src/main/java/com/dji/sample/patches/service/PatchesService.java
@@ -7,5 +7,5 @@
import java.sql.Array;
public interface PatchesService {
- PageBean limitGet (Integer id, String bsm, String tuban , String dklx, int page, int pageSize);
+ PageBean limitGet (Integer id, String dkbh, String dkfw , 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 14ae024..6fc380f 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
@@ -20,13 +20,13 @@
private PatchesMapper mapper;
@Override
- public PageBean limitGet(Integer id, String bsm, String tuban, String dklx, int page, int pageSize) {
+ public PageBean limitGet(Integer id, String dkbh, String dkfw,int page, int pageSize) {
//1. 设置分页参数
PageHelper.startPage(page,pageSize);
//2. 执行查询
- List<PatchesEntity> PatchersList = mapper.limitGet(id,bsm,tuban,dklx);
+ List<PatchesEntity> PatchersList = mapper.limitGet(id,dkbh,dkfw);
com.github.pagehelper.Page<PatchesEntity> p = (Page<PatchesEntity>) PatchersList;
//3. 封装PageBean对象
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 33f69ec..dba68a9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
#spring
spring:
datasource:
-# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
-# username: root
-# password: yshb@123
- url: jdbc:mysql://192.168.2.104:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
- password: 123456
+ password: yshb@123
+# url: jdbc:mysql://192.168.2.104:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+# username: root
+# password: 123456
redis:
host: 127.0.0.1
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ed74bbe..4855df9 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,12 +1,12 @@
#spring
spring:
datasource:
-# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
-# username: root
-# password: yshb@123
- url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
- password: jxpskj_2018
+ password: yshb@123
+# url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+# username: root
+# password: jxpskj_2018
redis:
host: 127.0.0.1
--
Gitblit v1.9.3