隐患点

src/main/resources/application-dev.yml

@@ -5,7 +5,8 @@ server:
 # 开发环境配置
 spring:
   config:
-    import: classpath:application-database-dev.yml
+    import: classpath:config/database/application-database-dev.yml
+
   # redis
   data:
     redis:

src/main/resources/application-prod.yml

@@ -5,7 +5,8 @@ server:
 # 生产环境配置
 spring:
   config:
-    import: classpath:application-database-prod.yml
+    import: classpath:config/database/application-database-prod.yml
+
   # redis
   data:
     redis:

src/main/resources/application.yml

@@ -2,16 +2,12 @@
 spring:
   profiles:
     active: @spring.profiles.active@
+  config:
+    import: classpath:config/redis/redis-key.yml
 
 # MyBatis 配置
 mybatis:
   mapper-locations: classpath:mapper/*.xml
   type-aliases-package: com.gis.basic_template_not_login_back.entity
   configuration:
-    map-underscore-to-camel-case: true
-
-# 安全配置
-safety:
-  sm2:
-    # sm2公钥在redis存储名
-    global: 'sm2:keypair:global'
+    map-underscore-to-camel-case: true

src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gis.xian.mapper.XianHiddenDangerSpotsMapper">
+
+    <resultMap id="XianHiddenDangerSpotsResultMap" type="com.gis.xian.entity.XianHiddenDangerSpots">
+        <id property="id" column="id" />
+        <result property="fieldCode" column="field_code" />
+        <result property="province" column="province" />
+        <result property="provinceId" column="province_id" />
+        <result property="city" column="city" />
+        <result property="cityId" column="city_id" />
+        <result property="county" column="county" />
+        <result property="countyId" column="county_id" />
+        <result property="village" column="village" />
+        <result property="disasterName" column="disaster_name" />
+        <result property="lon" column="lon" />
+        <result property="lat" column="lat" />
+        <result property="geom" column="geom" />
+        <result property="position" column="position" />
+        <result property="disasterType" column="disaster_type" />
+        <result property="scaleGrade" column="scale_grade" />
+        <result property="riskGrade" column="risk_grade" />
+        <result property="isDelete" column="is_delete" />
+    </resultMap>
+
+    <resultMap id="XianHiddenDangerSpotsBasePointResultMap" type="com.gis.xian.entity.XianHiddenDangerSpotsBasePoint">
+        <id property="id" column="id" />
+        <result property="lon" column="lon" />
+        <result property="lat" column="lat" />
+        <result property="disasterType" column="disaster_type" />
+    </resultMap>
+
+    <resultMap id="XianHiddenDangerSpotsPointDetailResultMap" type="com.gis.xian.entity.XianHiddenDangerSpotsPointDetail">
+        <id property="id" column="id" />
+        <result property="fieldCode" column="field_code" />
+        <result property="disasterName" column="disaster_name" />
+        <result property="position" column="position" />
+        <result property="disasterType" column="disaster_type" />
+        <result property="scaleGrade" column="scale_grade" />
+        <result property="riskGrade" column="risk_grade" />
+    </resultMap>
+
+    <!-- 获取所有基础点：滑坡、泥石流、山洪、内涝 -->
+    <select id="getBasePoints" resultMap="XianHiddenDangerSpotsBasePointResultMap">
+        SELECT id, lon, lat, disaster_type FROM xian_hidden_danger_spots
+        <where>
+            <choose>
+                <when test='disasterType == "rainstorm"'>
+                    disaster_type IN('滑坡', '泥石流', '山洪', '内涝')
+                </when>
+                <otherwise>
+                    disaster_type IN('滑坡', '泥石流')
+                </otherwise>
+            </choose>
+        </where>
+    </select>
+
+    <!-- 根据id获取隐患点详情 -->
+    <select id="getPointDetailById" resultMap="XianHiddenDangerSpotsPointDetailResultMap">
+        SELECT id, field_code, disaster_name, position, disaster_type, scale_grade, risk_grade FROM xian_hidden_danger_spots
+        <where>
+            id = #{id}
+        </where>
+    </select>
+</mapper>

src/main/resources/config/database/application-database-dev.yml

@@ -25,7 +25,7 @@ spring:
 
     # 主库
     master:
-      url: jdbc:postgresql://47.92.216.173:7654/xian?characterEncoding=utf8&TimeZone=Asia/Shanghai
+      url: jdbc:postgresql://47.92.216.173:7654/xian_new?characterEncoding=utf8&TimeZone=Asia/Shanghai
       username: postgres
       password: zhangsan
       driver-class-name: org.postgresql.Driver

src/main/resources/config/redis/redis-key.yml

@@ -0,0 +1,14 @@
+# 安全配置
+safety:
+  sm2:
+    # sm2公钥在redis存储名
+    global: 'xian:sm2:keypair:global'
+
+
+# 初始化数据存储
+init:
+  data:
+    # 基础信息点数据：滑坡、泥石流、山洪、内涝
+    base-points:
+      rainstorm: 'xian:init:data:base-points:rainstorm'
+      earthquake: 'xian:init:data:base-points:earthquake'