From ff8d6c48e9fa3d4c71b2f8f0edf8235cc590f39d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 20 十月 2022 14:21:11 +0800
Subject: [PATCH] 修改地名地址接口
---
src/main/java/com/lf/server/config/InitConfig.java | 28 ++--
/dev/null | 63 ------------
data/项目实施计划（融合）v03.xlsx | 0
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 16 +-
src/main/java/com/lf/server/entity/bd/DlgAgnpEntity.java | 117 +++++++++++++++++++++++
data/db_fn.sql | 4
src/main/java/com/lf/server/LfApplication.java | 2
src/main/java/com/lf/server/service/show/ComprehensiveService.java | 12 +-
src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java | 14 +-
9 files changed, 155 insertions(+), 101 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 73e96c5..7182a1d 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -4,9 +4,9 @@
select c.relname as "tab", cast(obj_description(c.oid) as varchar) as "desc", a.attnum as "num", a.attname as "col",atthasdef,
concat_ws('', t.typname, SUBSTRING(format_type(a.atttypid, a.atttypmod) from '(.*)')) as "type", d.description as "bak"
-select *
+-- select *
from pg_attribute a left join pg_description d on d.objoid = a.attrelid and d.objsubid = a.attnum left join pg_class c
-on a.attrelid = c.oid left join pg_type t on a.atttypid = t.oid where a.attnum >= 0 and reltype>0 and relnamespace in (135502,69701)
+on a.attrelid = c.oid left join pg_type t on a.atttypid = t.oid where a.attnum >= 0 and reltype>0 and relnamespace in (29257,20582)--135502,69701
order by c.relname desc, a.attnum asc;
select pg_constraint.conname as pk_name,pg_attribute.attname as colname,pg_type.typname as typename from
diff --git "a/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx" "b/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx"
new file mode 100644
index 0000000..d8e13ab
--- /dev/null
+++ "b/data/\351\241\271\347\233\256\345\256\236\346\226\275\350\256\241\345\210\222\357\274\210\350\236\215\345\220\210\357\274\211v03.xlsx"
Binary files differ
diff --git a/src/main/java/com/lf/server/LfApplication.java b/src/main/java/com/lf/server/LfApplication.java
index 6e0cf35..7222088 100644
--- a/src/main/java/com/lf/server/LfApplication.java
+++ b/src/main/java/com/lf/server/LfApplication.java
@@ -1,6 +1,5 @@
package com.lf.server;
-import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -12,7 +11,6 @@
*/
@EnableSwagger2
@SpringBootApplication(scanBasePackages = {"com.lf.server.*"})
-@MapperScan(basePackages = {"com.lf.server.mapper"})
public class LfApplication {
public static void main(String[] args) {
SpringApplication.run(LfApplication.class, args);
diff --git a/src/main/java/com/lf/server/config/InitConfig.java b/src/main/java/com/lf/server/config/InitConfig.java
index 2f2a82b..dbd08ce 100644
--- a/src/main/java/com/lf/server/config/InitConfig.java
+++ b/src/main/java/com/lf/server/config/InitConfig.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.helper.PathHelper;
import com.lf.server.mapper.bd.DlgAgnpMapper;
import com.lf.server.service.sys.ArgsService;
@@ -46,7 +46,7 @@
//GdalHelper.readShp("E:\\data\\13.cppe\\shps\\addr.shp");
//GdalHelper.readGdb("E:\\Test\\addr.gdb");
- // com.lf.server.helper.RsaHelper.generate();
+ //com.lf.server.helper.RsaHelper.generate();
//testMybatisPlus();
@@ -64,18 +64,18 @@
* 娴嬭瘯 Mybatis-Plus
*/
private void testMybatisPlus() {
- DlgAgnp dlg = dlgAgnpMapper.selectById(1);
- dlg = dlgAgnpMapper.selectOne(2);
+ DlgAgnpEntity dlg = dlgAgnpMapper.selectById(1);
+ String wkt = dlgAgnpMapper.selectWktById(2);
Map<String, Object> map = new HashMap<String, Object>(3);
map.put("gid", 2);
- List<DlgAgnp> list1 = dlgAgnpMapper.selectByMap(map);
+ List<DlgAgnpEntity> list1 = dlgAgnpMapper.selectByMap(map);
- QueryWrapper<DlgAgnp> w1 = new QueryWrapper<>();
+ QueryWrapper<DlgAgnpEntity> w1 = new QueryWrapper<>();
w1.eq("name", "娌诲鍘�");
- List<DlgAgnp> list2 = dlgAgnpMapper.selectList(w1);
+ List<DlgAgnpEntity> list2 = dlgAgnpMapper.selectList(w1);
- UpdateWrapper<DlgAgnp> w2 = new UpdateWrapper<DlgAgnp>();
+ UpdateWrapper<DlgAgnpEntity> w2 = new UpdateWrapper<DlgAgnpEntity>();
// 璁剧疆鏇存柊鍐呭
w2.set("name", "newName").set("gb", "10013")
// 璁剧疆鏇存柊鏉′欢
@@ -86,23 +86,23 @@
ids.add(1);
ids.add(2);
// dlgAgnpMapper.deleteBatchIds(ids)
- List<DlgAgnp> list3 = dlgAgnpMapper.selectBatchIds(ids);
+ List<DlgAgnpEntity> list3 = dlgAgnpMapper.selectBatchIds(ids);
// dlgAgnpMapper.updateById(dlg)
// List<DlgAgnp> all = dlgAgnpMapper.selectList(null)
// 椤垫暟 / 姣忛〉璁板綍鏁�
- Page<DlgAgnp> page = new Page<>(1, 10);
+ Page<DlgAgnpEntity> page = new Page<>(1, 10);
// 鍗囧簭鎺掑簭
page.addOrder(OrderItem.asc("gid"));
// 鍒嗛〉锛歐rapper鏌ヨ鏉′欢
- Page<DlgAgnp> userPage = dlgAgnpMapper.selectPage(page, null);
+ Page<DlgAgnpEntity> userPage = dlgAgnpMapper.selectPage(page, null);
// 鎬婚〉鏁� / 鎬昏褰曟暟锛�325 / 3247
String str = userPage.getPages() + " / " + userPage.getTotal();
- List<DlgAgnp> list4 = userPage.getRecords();
+ List<DlgAgnpEntity> list4 = userPage.getRecords();
- QueryWrapper<DlgAgnp> w3 = new QueryWrapper<>();
+ QueryWrapper<DlgAgnpEntity> w3 = new QueryWrapper<>();
w3.like("name", "澶�").ge("gid", 100);
- List<DlgAgnp> list5 = dlgAgnpMapper.selectList(w3);
+ List<DlgAgnpEntity> list5 = dlgAgnpMapper.selectList(w3);
}
}
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 0554c7d..835ec96 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -4,7 +4,7 @@
import com.lf.server.aspect.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.service.show.ComprehensiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -36,13 +36,13 @@
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectAddrByPage")
- public ResponseMsg<List<DlgAgnp>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<DlgAgnpEntity>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- Page<DlgAgnp> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
+ Page<DlgAgnpEntity> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
@@ -51,16 +51,16 @@
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ-鍦板悕鍦板潃")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨWKT-鍦板悕鍦板潃")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectAddrById")
- public ResponseMsg<DlgAgnp> selectAddrById(Integer id) {
+ @GetMapping(value = "/selectWktById")
+ public ResponseMsg<String> selectWktById(Integer id) {
try {
- DlgAgnp entity = comprehensiveService.selectAddrById(id);
+ String wkt = comprehensiveService.selectWktById(id);
- return success(entity);
+ return success(wkt);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
diff --git a/src/main/java/com/lf/server/entity/bd/DlgAgnp.java b/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
deleted file mode 100644
index 02fd03c..0000000
--- a/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.lf.server.entity.bd;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * 鍦板悕鍦板潃
- * @author WWW
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName("bd.dlg_agnp")
-public class DlgAgnp implements Serializable {
- private static final long serialVersionUID = 7302992218530584319L;
-
- @TableId(type = IdType.AUTO)
- private int gid;
-
- private String gb;
-
- private String name;
-
- @TableField(select = false)
- private String geom;
-
- public int getGid() {
- return gid;
- }
-
- public void setGid(int gid) {
- this.gid = gid;
- }
-
- public String getGb() {
- return gb;
- }
-
- public void setGb(String gb) {
- this.gb = gb;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getGeom() {
- return geom;
- }
-
- public void setGeom(String geom) {
- this.geom = geom;
- }
-}
diff --git a/src/main/java/com/lf/server/entity/bd/DlgAgnpEntity.java b/src/main/java/com/lf/server/entity/bd/DlgAgnpEntity.java
new file mode 100644
index 0000000..0fe3de4
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/bd/DlgAgnpEntity.java
@@ -0,0 +1,117 @@
+package com.lf.server.entity.bd;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * DlgAgnp
+ * @author WWW
+ */
+@Data
+@AllArgsConstructor
+@TableName("bd.dlg_agnp")
+public class DlgAgnpEntity implements Serializable {
+ private static final long serialVersionUID = 558385325390093696L;
+
+ @TableId(type = IdType.AUTO)
+ private Integer gid;
+
+ private Long objectid;
+
+ private String gb;
+
+ private String name;
+
+ @TableField(value = "class")
+ private String clazz;
+
+ private String pinyin;
+
+ private String pac;
+
+ private String bsm;
+
+ @TableField(select = false)
+ private String geom;
+
+ public DlgAgnpEntity() {
+ }
+
+ public Integer getGid() {
+ return gid;
+ }
+
+ public void setGid(Integer gid) {
+ this.gid = gid;
+ }
+
+ public Long getObjectid() {
+ return objectid;
+ }
+
+ public void setObjectid(Long objectid) {
+ this.objectid = objectid;
+ }
+
+ public String getGb() {
+ return gb;
+ }
+
+ public void setGb(String gb) {
+ this.gb = gb;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getClazz() {
+ return clazz;
+ }
+
+ public void setClazz(String clazz) {
+ this.clazz = clazz;
+ }
+
+ public String getPinyin() {
+ return pinyin;
+ }
+
+ public void setPinyin(String pinyin) {
+ this.pinyin = pinyin;
+ }
+
+ public String getPac() {
+ return pac;
+ }
+
+ public void setPac(String pac) {
+ this.pac = pac;
+ }
+
+ public String getBsm() {
+ return bsm;
+ }
+
+ public void setBsm(String bsm) {
+ this.bsm = bsm;
+ }
+
+ public String getGeom() {
+ return geom;
+ }
+
+ public void setGeom(String geom) {
+ this.geom = geom;
+ }
+}
diff --git a/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java b/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
index 51249ff..e2ca817 100644
--- a/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
+++ b/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
@@ -1,23 +1,25 @@
package com.lf.server.mapper.bd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.entity.bd.DlgAgnpEntity;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
/**
- * 鍦板悕鍦板潃
+ * DlgAgnp
* @author WWW
*/
+@Mapper
@Repository
-public interface DlgAgnpMapper extends BaseMapper<DlgAgnp> {
+public interface DlgAgnpMapper extends BaseMapper<DlgAgnpEntity> {
/**
- * 鏌ヨ涓�鏉�
+ * 鏍规嵁ID鏌ヨWKT
*
* @param gid
* @return
*/
- @Select("select gid,gb,name,st_astext(geom) geom from bd.dlg_agnp where gid = #{gid}")
- DlgAgnp selectOne(@Param("gid") Integer gid);
+ @Select("select st_astext(geom) geom from bd.dlg_agnp where gid = #{gid}")
+ String selectWktById(@Param("gid") Integer gid);
}
diff --git a/src/main/java/com/lf/server/service/show/ComprehensiveService.java b/src/main/java/com/lf/server/service/show/ComprehensiveService.java
index 8aa17e5..ea3398c 100644
--- a/src/main/java/com/lf/server/service/show/ComprehensiveService.java
+++ b/src/main/java/com/lf/server/service/show/ComprehensiveService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.bd.DlgAgnpMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,11 +18,11 @@
@Autowired
DlgAgnpMapper dlgAgnpMapper;
- public Page<DlgAgnp> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
- Page<DlgAgnp> paging = new Page<>(pageIndex, pageSize);
+ public Page<DlgAgnpEntity> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ Page<DlgAgnpEntity> paging = new Page<>(pageIndex, pageSize);
paging.addOrder(OrderItem.asc("gid"));
- QueryWrapper<DlgAgnp> wrapper = null;
+ QueryWrapper<DlgAgnpEntity> wrapper = null;
if (!StringHelper.isEmpty(name)) {
wrapper = new QueryWrapper<>();
wrapper.like("name", name.trim());
@@ -31,7 +31,7 @@
return dlgAgnpMapper.selectPage(paging, wrapper);
}
- public DlgAgnp selectAddrById(Integer id) {
- return dlgAgnpMapper.selectOne(id);
+ public String selectWktById(Integer id) {
+ return dlgAgnpMapper.selectWktById(id);
}
}
--
Gitblit v1.9.3