From 944091a18721ccd38a7c583acf2a6c68fa457990 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 16 十一月 2022 10:05:36 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/config/InitConfig.java | 13 +-
/dev/null | 83 -------------
src/main/java/com/lf/server/entity/md/MdZxcgEntity.java | 153 +++++++++++++++++++++++++
src/main/java/com/lf/server/entity/md/MdGdcgEntity.java | 6
data/db_fn.sql | 7
data/db_tab.sql | 52 ++++++++
说明.txt | 8
7 files changed, 220 insertions(+), 102 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 9e519ae..acd2e6d 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -254,12 +254,12 @@
select to_char(optime,'yyyy-mm-dd') as optime,count(*) from lf.sys_login where optime between (select optime - interval '30 day')
and optime group by to_char(optime, 'yyyy-mm-dd') order by to_char(optime, 'yyyy-mm-dd') asc;
------------------------------------------------------------------------------------------------------
+
select a.*,coalesce(a.native,'') from lf.sys_user a;
select ST_PointFromText('POINT(95.80461853400004 34.13862467200005)');
select ST_LineFromText('LINESTRING(04.98985101830993 37.43840773692756,104.99318913447104 37.43883729720358)', 4326);
select ST_PolygonFromText('POLYGON((104.9907822932683 37.43532941961706,104.99088987736599 37.43532941961706,104.9908670336867 37.4349030213574,104.99078327712658 37.4349030213574,104.9907822932683 37.43532941961706))',4326);
-
+----------------------------------------------------------------------------------------------
-- 114ms锛�180/3248
select count(1) from bd.dlg_agnp a where ST_Intersects(geom,
ST_PolygonFromText('POLYGON ((115.94927385452 32.3754479115071 0,121.989371092554 32.2766788010181 0,121.850621222894 29.6874200067864 0,115.9727267226 29.7835368627922 0,115.94927385452 32.3754479115071 0))', 4326))
@@ -285,8 +285,7 @@
select a.* from lf.sys_domain a where exists (select * from lf.sys_dict b where b.ns = 'bd' and b.tab = 'dlg_25w_hyda') and a.dom_code like '210%' order by a.id
select * from lf.sys_download a where create_user = 1 and type = 2;
-
-
+----------------------------------------------------------------------------------------------
diff --git a/data/db_tab.sql b/data/db_tab.sql
index c75b534..248e1b2 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -950,4 +950,54 @@
comment on column lf.sys_domain.bak is '澶囨敞';
select * from lf.sys_domain order by dom_name,orderid;
------------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------- 鍏冩暟鎹祴璇曡〃 *
+-- drop table if exists md.md_zxcg;
+create table md.md_zxcg(
+ id serial primary key,
+ zh varchar(50),
+ zj float8,
+ lc float8,
+ x float8,
+ y float8,
+ z float8,
+ pid integer,
+ create_user integer,
+ create_time timestamp(6) without time zone default now(),
+ update_user integer,
+ update_time timestamp(6) without time zone
+);
+comment on table md.md_zxcg is '涓嚎鎴愭灉琛�';
+
+select * from md.md_zxcg;
+
+-- drop table if exists md.md_gdcg;
+create table md.md_gdcg(
+ id serial primary key,
+ bh varchar(100),
+ gxdh varchar(100),
+ ljdh varchar(100),
+ msfs varchar(100),
+ gxcl varchar(100),
+ gjcc varchar(100),
+ tz varchar(100),
+ fsw varchar(100),
+ x float8,
+ y float8,
+ dm float8,
+ gd float8,
+ gnd float8,
+ ms float8,
+ dngs varchar(100),
+ gkpl varchar(100),
+ dldy varchar(100),
+ bz varchar(100),
+ pid integer,
+ create_user integer,
+ create_time timestamp(6) without time zone default now(),
+ update_user integer,
+ update_time timestamp(6) without time zone
+);
+comment on table md.md_gdcg is '绠￠亾鎴愭灉琛�';
+
+select * from md.md_gdcg;
+-----------------------------------------------------------------------------------------------------
diff --git a/src/main/java/com/lf/server/config/InitConfig.java b/src/main/java/com/lf/server/config/InitConfig.java
index 1be412d..72d543f 100644
--- a/src/main/java/com/lf/server/config/InitConfig.java
+++ b/src/main/java/com/lf/server/config/InitConfig.java
@@ -4,13 +4,11 @@
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.controller.other.FloatServerController;
import com.lf.server.entity.all.MenusAuthEntity;
import com.lf.server.entity.all.PermsAuthEntity;
import com.lf.server.entity.all.ResAuthEntity;
import com.lf.server.entity.bd.DlgAgnpEntity;
-import com.lf.server.entity.bs.Gxcg;
-import com.lf.server.entity.bs.Zxcg;
+import com.lf.server.entity.md.*;
import com.lf.server.helper.*;
import com.lf.server.mapper.bd.DlgAgnpMapper;
import com.lf.server.service.all.BaseQueryService;
@@ -35,6 +33,7 @@
* @author WWW
*/
@Component
+@SuppressWarnings("AlibabaRemoveCommentedCode")
public class InitConfig implements ApplicationRunner {
private final static Log log = LogFactory.getLog(InitConfig.class);
@@ -189,11 +188,11 @@
}
private void testReadExcel() {
- List<Zxcg> listZxcg = ExcelHelper.readExcel(Zxcg.class, "D:\\LF\\data\\xls\\娴嬬粯\\1-椤圭洰鎴愭灉-瑗夸笁涓璡\1-1涓嚎鎴愭灉琛╘\娴峰師鍘夸腑绾挎垚鏋滆〃.xlsx");
- int r1 = listZxcg.size();
+ List<MdZxcgEntity> listMdZxcg = ExcelHelper.readExcel(MdZxcgEntity.class, "D:\\LF\\data\\xls\\娴嬬粯\\1-椤圭洰鎴愭灉-瑗夸笁涓璡\1-1涓嚎鎴愭灉琛╘\娴峰師鍘夸腑绾挎垚鏋滆〃.xlsx");
+ int r1 = listMdZxcg.size();
- //List<Gxcg> listGxcg = ExcelHelper.readExcel(Gxcg.class, "D:\\LF\\data\\xls\\娴嬬粯\\2-鍦颁笅绠＄嚎鎺㈡祴鎴愭灉\\2-2 绠＄嚎鎴愭灉琛�.xlsx");
- //int r2 = listGxcg.size();
+ //List<MdGdcgEntity> listGdcg = ExcelHelper.readExcel(MdGdcgEntity.class, "D:\\LF\\data\\xls\\娴嬬粯\\2-鍦颁笅绠＄嚎鎺㈡祴鎴愭灉\\2-2 绠＄嚎鎴愭灉琛�.xlsx");
+ //int r2 = listGdcg.size();
String entityName = "Gxcg";
String xls = "D:\\LF\\data\\xls\\娴嬬粯\\2-鍦颁笅绠＄嚎鎺㈡祴鎴愭灉\\2-2 绠＄嚎鎴愭灉琛�.xlsx";
diff --git a/src/main/java/com/lf/server/entity/bs/Zxcg.java b/src/main/java/com/lf/server/entity/bs/Zxcg.java
deleted file mode 100644
index e123b47..0000000
--- a/src/main/java/com/lf/server/entity/bs/Zxcg.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.lf.server.entity.bs;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.lf.server.annotation.ExcelHead;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 涓嚎鎴愭灉琛�
- * @author WWW
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ExcelHead(headRows = 1)
-public class Zxcg {
- @ExcelProperty(index = 0)
- private String zhuangHao;
-
- @ExcelProperty(index = 1)
- private Double zhuanJiao;
-
- @ExcelProperty(index = 2)
- private double liCheng;
-
- @ExcelProperty(index = 3)
- private double x;
-
- @ExcelProperty(index = 4)
- private double y;
-
- @ExcelProperty(index = 5)
- private double z;
-
- public String getZhuangHao() {
- return zhuangHao;
- }
-
- public void setZhuangHao(String zhuangHao) {
- this.zhuangHao = zhuangHao;
- }
-
- public Double getZhuanJiao() {
- return zhuanJiao;
- }
-
- public void setZhuanJiao(Double zhuanJiao) {
- this.zhuanJiao = zhuanJiao;
- }
-
- public double getLiCheng() {
- return liCheng;
- }
-
- public void setLiCheng(double liCheng) {
- this.liCheng = liCheng;
- }
-
- public double getX() {
- return x;
- }
-
- public void setX(double x) {
- this.x = x;
- }
-
- public double getY() {
- return y;
- }
-
- public void setY(double y) {
- this.y = y;
- }
-
- public double getZ() {
- return z;
- }
-
- public void setZ(double z) {
- this.z = z;
- }
-}
diff --git a/src/main/java/com/lf/server/entity/bs/Gxcg.java b/src/main/java/com/lf/server/entity/md/MdGdcgEntity.java
similarity index 95%
rename from src/main/java/com/lf/server/entity/bs/Gxcg.java
rename to src/main/java/com/lf/server/entity/md/MdGdcgEntity.java
index 4aae1ec..1cb2d80 100644
--- a/src/main/java/com/lf/server/entity/bs/Gxcg.java
+++ b/src/main/java/com/lf/server/entity/md/MdGdcgEntity.java
@@ -1,6 +1,7 @@
-package com.lf.server.entity.bs;
+package com.lf.server.entity.md;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.lf.server.annotation.ExcelHead;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -13,8 +14,9 @@
@Data
@NoArgsConstructor
@AllArgsConstructor
+@TableName("md.md_gdcg")
@ExcelHead(headRows = 3,excludeSheets = "灏侀潰,鐩綍")
-public class Gxcg {
+public class MdGdcgEntity {
@ExcelProperty(index = 0)
private String bh;
diff --git a/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java b/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java
new file mode 100644
index 0000000..3427b09
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/md/MdZxcgEntity.java
@@ -0,0 +1,153 @@
+package com.lf.server.entity.md;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lf.server.annotation.ExcelHead;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 涓嚎鎴愭灉琛�
+ * @author WWW
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("md.md_zxcg")
+@ExcelHead(headRows = 1)
+public class MdZxcgEntity implements Serializable {
+ private static final long serialVersionUID = 686714648588893312L;
+
+ @TableId(type = IdType.AUTO)
+ private Integer gid;
+
+ @ExcelProperty(index = 0)
+ private String zh;
+
+ @ExcelProperty(index = 1)
+ private Double zj;
+
+ @ExcelProperty(index = 2)
+ private Double lc;
+
+ @ExcelProperty(index = 3)
+ private Double x;
+
+ @ExcelProperty(index = 4)
+ private Double y;
+
+ @ExcelProperty(index = 5)
+ private Double z;
+
+ private Integer pid;
+
+ private Integer createUser;
+
+ private Timestamp createTime;
+
+ private Integer updateUser;
+
+ private Timestamp updateTime;
+
+ public Integer getGid() {
+ return gid;
+ }
+
+ public void setGid(Integer gid) {
+ this.gid = gid;
+ }
+
+ public String getZh() {
+ return zh;
+ }
+
+ public void setZh(String zh) {
+ this.zh = zh;
+ }
+
+ public Double getZj() {
+ return zj;
+ }
+
+ public void setZj(Double zj) {
+ this.zj = zj;
+ }
+
+ public Double getLc() {
+ return lc;
+ }
+
+ public void setLc(Double lc) {
+ this.lc = lc;
+ }
+
+ public Double getX() {
+ return x;
+ }
+
+ public void setX(Double x) {
+ this.x = x;
+ }
+
+ public Double getY() {
+ return y;
+ }
+
+ public void setY(Double y) {
+ this.y = y;
+ }
+
+ public Double getZ() {
+ return z;
+ }
+
+ public void setZ(Double z) {
+ this.z = z;
+ }
+
+ public Integer getPid() {
+ return pid;
+ }
+
+ public void setPid(Integer pid) {
+ this.pid = pid;
+ }
+
+ public Integer getCreateUser() {
+ return createUser;
+ }
+
+ public void setCreateUser(Integer createUser) {
+ this.createUser = createUser;
+ }
+
+ public Timestamp getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Timestamp createTime) {
+ this.createTime = createTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ public Timestamp getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Timestamp updateTime) {
+ this.updateTime = updateTime;
+ }
+}
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index fd25d20..ff579e9 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -41,19 +41,17 @@
40.寮�鍙戞牴鎹疄浣撳悕绉版煡璇㈢┖闂磋〃鐨刉KT璁板綍
41.鎼缓QGIS+Python寮�鍙戠幆澧�
42.寮�鍙戞牴鎹悕绉版ā绯婃悳绱㈢敤鎴枫�佸崟浣嶇殑鍓�10鏉¤褰�
-43.鏋勫缓QGIS宸ョ▼锛屼娇鐢≒ython杩愯宸ョ▼ <
-44.
-45.
+43.鏋勫缓QGIS宸ョ▼锛屼娇鐢≒ython杩愯宸ョ▼
+44.寮�鍙慟GIS鐢熸垚涓撻鍥惧姛鑳�
+45.寮�鍙戞牴鎹爣缁楯SON鏁版嵁鐢熸垚shp鏂囦欢骞朵笅杞� <
46.
47.
48.
49.
50.
-----------------------------------------------
-.寮�鍙戞牴鎹爣缁楯SON鏁版嵁鐢熸垚shp鏂囦欢骞朵笅杞�
.寮�鍙戜笂浼爏hp鏂囦欢杞崲涓篔SON鏁版嵁鎺ュ彛
.鍒涘缓QGIS鍑哄浘妯℃澘
-.寮�鍙慞ython鍑哄浘鍔熻兘
.寮�鍙慟GIS鍑哄浘鐨凜#鏈嶅姟
.閲囩敤鏍煎紡鍖栧弬鏁拌繍琛孭ython绋嬪簭
.
--
Gitblit v1.9.3