From a379ac818c149b682f70cf8ebc97a3979da17291 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 19 十月 2022 14:18:54 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/config/InitConfig.java       |   41 ++++++++++
 src/main/java/com/lf/server/helper/PathHelper.java       |    2 
 src/main/java/com/lf/server/helper/StringHelper.java     |    8 --
 data/db_fn.sql                                           |    1 
 data/menu-执行.xls                                         |    0 
 src/main/java/com/lf/server/LfApplication.java           |    4 
 说明.txt                                                   |    7 +
 src/main/java/com/lf/server/entity/bd/DlgAgnp.java       |   74 ++++++++++++++++++
 pom.xml                                                  |   18 +++-
 src/main/resources/application.yml                       |   12 ++
 src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java |   15 +++
 11 files changed, 162 insertions(+), 20 deletions(-)

diff --git a/data/db_fn.sql b/data/db_fn.sql
index 270c1c0..7e4d20c 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -193,6 +193,7 @@
 inner join lf.sys_auth c on b.authid = c.id where a.roleid = 1 and b.menuid = 1 order by c.id;
 ----------------------------------------------------------------------------------------------------- 
 select * from lf.sys_user;
+select gid,gb,name,st_astext(a.geom) from bd.dlg_agnp a;
 
 
 
diff --git "a/data/menu-\346\211\247\350\241\214.xls" "b/data/menu-\346\211\247\350\241\214.xls"
index 8296612..cfd7696 100644
--- "a/data/menu-\346\211\247\350\241\214.xls"
+++ "b/data/menu-\346\211\247\350\241\214.xls"
Binary files differ
diff --git a/pom.xml b/pom.xml
index b52f064..eee50ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,18 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+        <!--mybatis-->
+        <!--<dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.2.0</version>
+        </dependency>-->
         <!--redis-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -79,12 +91,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.47</version>
-        </dependency>
-        <!--mybatis-->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.2.0</version>
         </dependency>
         <!--鏁村悎druid鏁版嵁婧�-->
         <dependency>
diff --git a/src/main/java/com/lf/server/LfApplication.java b/src/main/java/com/lf/server/LfApplication.java
index 34362d9..fe54c16 100644
--- a/src/main/java/com/lf/server/LfApplication.java
+++ b/src/main/java/com/lf/server/LfApplication.java
@@ -1,5 +1,6 @@
 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;
@@ -10,7 +11,8 @@
  * 鎺掗櫎Security锛�, exclude = {SecurityAutoConfiguration.class, SecurityFilterAutoConfiguration.class}
  */
 @EnableSwagger2
-@SpringBootApplication(scanBasePackages={"com.lf.server.*"})
+@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 d0a9615..4dcc09c 100644
--- a/src/main/java/com/lf/server/config/InitConfig.java
+++ b/src/main/java/com/lf/server/config/InitConfig.java
@@ -1,7 +1,10 @@
 package com.lf.server.config;
 
-import com.lf.server.helper.GdalHelper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.lf.server.entity.bd.DlgAgnp;
 import com.lf.server.helper.PathHelper;
+import com.lf.server.mapper.bd.DlgAgnpMapper;
 import com.lf.server.service.sys.ArgsService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -9,6 +12,10 @@
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 鍒濆鍖栧畬鎴愰厤缃被
@@ -24,6 +31,9 @@
     @Autowired
     ArgsService argsService;
 
+    @Autowired
+    DlgAgnpMapper dlgAgnpMapper;
+
     @Override
     public void run(ApplicationArguments args) {
         // noinspection AlibabaRemoveCommentedCode
@@ -33,6 +43,8 @@
             //GdalHelper.readShp("E:\\data\\13.cppe\\shps\\addr.shp");
             //GdalHelper.readGdb("E:\\Test\\addr.gdb");
 
+            testMybatisPlus();
+
             pathHelper.init();
 
             argsService.initSettingData();
@@ -42,4 +54,31 @@
             log.error(ex.getMessage() + ex.getStackTrace() + "\n");
         }
     }
+
+    private void testMybatisPlus() {
+        DlgAgnp dlg = dlgAgnpMapper.selectById(1);
+
+        Map<String, Object> map = new HashMap<String, Object>(3);
+        map.put("id", 1);
+        map.put("id", 2);
+        List<DlgAgnp> list1 = dlgAgnpMapper.selectByMap(map);
+
+        QueryWrapper<DlgAgnp> w1 = new QueryWrapper<>();
+        w1.eq("name", "娌诲鍘�");
+        List<DlgAgnp> list2 = dlgAgnpMapper.selectList(w1);
+
+
+        UpdateWrapper<DlgAgnp> w2 = new UpdateWrapper<DlgAgnp>();
+        // 璁剧疆鏇存柊鍐呭
+        w2.set("name", "newName").set("gb", "10013")
+                // 璁剧疆鏇存柊鏉′欢
+                .eq("id", 0);
+        dlgAgnpMapper.update(null, w2);
+
+        //List<Integer> ids = new ArrayList<Integer>();
+        //ids.add(1);
+        //ids.add(2);
+        //dlgAgnpMapper.deleteBatchIds(ids);
+        //dlgAgnpMapper.updateById(dlg);
+    }
 }
diff --git a/src/main/java/com/lf/server/entity/bd/DlgAgnp.java b/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
new file mode 100644
index 0000000..ab9a8e2
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
@@ -0,0 +1,74 @@
+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;
+
+    @TableField(select = false)
+    private String eventId;
+
+    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;
+    }
+
+    public String getEventId() {
+        return eventId;
+    }
+
+    public void setEventId(String eventId) {
+        this.eventId = eventId;
+    }
+}
diff --git a/src/main/java/com/lf/server/helper/PathHelper.java b/src/main/java/com/lf/server/helper/PathHelper.java
index 4dcbe1f..3379fa1 100644
--- a/src/main/java/com/lf/server/helper/PathHelper.java
+++ b/src/main/java/com/lf/server/helper/PathHelper.java
@@ -120,7 +120,7 @@
      * 鑾峰彇涓存椂璺緞
      */
     public String getTempPath() {
-        String tempName = StringHelper.getDateFormat4();
+        String tempName = StringHelper.YMD_HM_FORMAT.format(new Date());
         String tempPath = config.getTempPath();
         String path = tempPath + File.separator + tempName;
 
diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index 6a74f6d..2951518 100644
--- a/src/main/java/com/lf/server/helper/StringHelper.java
+++ b/src/main/java/com/lf/server/helper/StringHelper.java
@@ -2,7 +2,6 @@
 
 import com.lf.server.entity.all.StaticData;
 
-import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.regex.Matcher;
@@ -117,12 +116,5 @@
      */
     public static boolean checkPwdValid(String pwd) {
         return Pattern.matches(StaticData.PWD_REG, pwd);
-    }
-
-    /**
-     * 鑾峰彇鏃ユ湡鏍煎紡鍖�4锛歽yyyMMdd_HHmm
-     */
-    public static String getDateFormat4() {
-        return YMD_HM_FORMAT.format(new Date());
     }
 }
diff --git a/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java b/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
new file mode 100644
index 0000000..5ccecc5
--- /dev/null
+++ b/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
@@ -0,0 +1,15 @@
+package com.lf.server.mapper.bd;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lf.server.entity.bd.DlgAgnp;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 鍦板悕鍦板潃
+ * @author
+ */
+@Repository
+public interface DlgAgnpMapper extends BaseMapper<DlgAgnp> {
+    // 鎵�鏈夌殑crud閮界紪鍐欏畬鎴愪簡
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 257aa9b..135fc59 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,6 +43,7 @@
     username : postgres
     password: postgres
     driver-class-name: org.postgresql.Driver
+    paltform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
     # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
     filters: stat,wall,log4j
@@ -114,10 +115,17 @@
             slow-sql-millis: 2000
 
 # mybatis
-mybatis:
-  type-aliases-package: com.lf.server.mapper
+#mybatis:
+#  type-aliases-package: com.lf.server.entity
+#  config-location: classpath:mybatis.xml
+#  mapper-locations: classpath:mapper/**/*.xml
+
+mybatis-plus:
+  map-underscore-to-camel-case: true
+  type-aliases-package: com.lf.server.entity
   config-location: classpath:mybatis.xml
   mapper-locations: classpath:mapper/**/*.xml
+
 # logging
 logging:
   config: classpath:logback-spring.xml
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 4d02d07..07039d2 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -46,6 +46,11 @@
 .gdb > HFCP+LRRL + TFCA
 .shp  > F5004_WT.shp + F5004_WL.shp + F5004.shp
 ----------------------------------------------------------------------------------------------------
+java鍜宩s瀹炵幇aes鍔犲瘑瑙e瘑锛�
+https://blog.csdn.net/weixin_30663839/article/details/114049667
+
+
+----------------------------------------------------------------------------------------------------
 String path = System.getProperty("user.dir");
 
 String uid = RsaHelper.decrypt(user.getUid());
@@ -68,7 +73,7 @@
 
 涓嬭浇锛歨ttp://127.0.0.1:12316/style/download?guid=15deb4e6bf02db827e39521758520fd5
 
-浣跨敤Commons FileUpLoad缁勪欢瀹炵幇鏂囦欢涓婁紶鍔熻兘锛�
+浣跨敤Commons FileUpLoad 鏂囦欢涓婁紶鍔熻兘锛�
 https://www.itdaan.com/blog/2017/08/08/b2dbc1106fa7.html
 ----------------------------------------------------------------------------------------------------
 涓�銆佸紑鍙戣繍琛岀幆澧�

--
Gitblit v1.9.3