修改格式,修改森林数据

This commit is contained in:
2022-11-01 15:28:49 +08:00
parent 854afa033d
commit 382d9018e8
371 changed files with 193133 additions and 29 deletions

View File

@ -10,6 +10,7 @@
<result property="city" column="city"/>
<result property="areaValue" column="area_value"/>
<result property="superior" column="superior"/>
<result property="cityEn" column="city_en"/>
<result property="country" column="country"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
@ -17,7 +18,7 @@
<sql id="columns_ore">
<![CDATA[
id,position,city,area_value,superior,created_by,created_time,country
id,position,city_en,city,area_value,superior,created_by,created_time,country
]]>
</sql>
@ -37,7 +38,6 @@
<resultMap id="RM_Expand" type="com.ruoyi.system.domain_yada.CityFocusVO">
<result property="id" column="id"/>
<result property="year" column="year"/>
<result property="city" column="city"/>
<result property="xAxis" column="x_axis"/>
<result property="yAxis" column="y_axis"/>
@ -51,7 +51,7 @@
<sql id="columns">
<![CDATA[
id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
id,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
]]>
</sql>
@ -64,15 +64,13 @@
<if test="country!= null and country !=''">
AND country = #{country}
</if>
<if test="year!= null and year !=''">
AND year = #{year}
</if>
</select>
<resultMap id="RM_Inform" type="com.ruoyi.system.domain_yada.CityInformation">
<result property="id" column="id"/>
<result property="year" column="year"/>
<result property="city" column="city"/>
<result property="cityEn" column="city_en"/>
<result property="area" column="area"/>
<result property="imperviousSurfaceArea" column="impervious_surface_area"/>
<result property="imperviousSurfaceCoverage" column="impervious_surface_coverage"/>
@ -85,7 +83,7 @@
<sql id="columns_Infrom">
<![CDATA[
id,year,city,area,impervious_surface_area,impervious_surface_coverage,speed,strength,contribution,superior,country
id,year,city,city_en,area,impervious_surface_area,impervious_surface_coverage,speed,strength,contribution,superior,country
]]>
</sql>
@ -101,6 +99,9 @@
<if test="year!= null and year !=''">
AND year = #{year}
</if>
<if test="basin!= null and basin !=''">
AND basin = #{basin}
</if>
</select>
<select id="selectMain" resultMap="RM_Inform">

View File

@ -8,6 +8,7 @@
<result property="id" column="id"/>
<result property="year" column="year"/>
<result property="city" column="city"/>
<result property="cityEn" column="city_en"/>
<result property="area" column="area"/>
<result property="imperviousSurfaceArea" column="Impervious_surface_area"/>
<result property="imperviousSurfaceCoverage" column="Impervious_surface_coverage"/>
@ -19,7 +20,7 @@
<sql id="columns">
<![CDATA[
id,year,city,area,Impervious_surface_area,Impervious_surface_coverage,speed,strength,contribution,superior
id,year,city,city_en,area,Impervious_surface_area,Impervious_surface_coverage,speed,strength,contribution,superior
]]>
</sql>

View File

@ -0,0 +1,26 @@
<?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.ruoyi.system.mapper_yada.ForestDetectionMapper">
<!-- <resultMap id="RM_TypeTable" type="com.ruoyi.system.domain_yada.TypeTable">-->
<!-- <result property="id" column="id"/>-->
<!-- <result property="class1" column="class1"/>-->
<!-- <result property="percentage" column="percentage"/>-->
<!-- </resultMap>-->
<!-- -->
<select id="selectType" resultType="com.ruoyi.system.domain_yada.TypeTable">
SELECT id,class1,percentage,china FROM type_table
</select>
<select id="selectChange" resultType="com.ruoyi.system.domain_yada.ChangeTable">
SELECT id,country,forestloss,forestgain,china FROM change_table
</select>
<select id="selectCloumnar" resultType="com.ruoyi.system.domain_yada.CloumnarTable">
SELECT id,country,year,forestcover,china FROM columnar_table
</select>
</mapper>

View File

@ -10,10 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dateTime" column="date_time"/>
<result property="spaceDistinguish" column="space_distinguish"/>
<result property="timeDistinguish" column="time_distinguish"/>
<result property="timeDistinguishEn" column="time_distinguish_en"/>
<result property="zone" column="zone"/>
<result property="zoneEn" column="zone_en"/>
<result property="filePath" column="file_path"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
<result property="fileNameEn" column="file_name_en"/>
</resultMap>
<resultMap id="RM_Upload" type="com.ruoyi.system.domain_yada.UploadSpecialVO">
@ -27,17 +30,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="type" column="type"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
<result property="fileNameEn" column="file_name_en"/>
</resultMap>
<sql id="columns">
<![CDATA[
id,file_name,file_path,date_time,space_distinguish,time_distinguish,zone,created_by,created_time
id,file_name,zone_en,time_distinguish_en,file_name_en,file_path,date_time,space_distinguish,time_distinguish,zone,created_by,created_time
]]>
</sql>
<sql id="Upload">
<![CDATA[
id,file_name,upload_num,file_path,remarks1,remarks2,type,created_by,created_time,sign
id,file_name,file_name_en,upload_num,file_path,remarks1,remarks2,type,created_by,created_time,sign
]]>
</sql>

View File

@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pictureTypeTwo" column="picture_type_two"/>
<result property="pictureEn" column="picture_en"/>
<result property="pictureName" column="picture_name"/>
<result property="pictureNameEn" column="picture_name_en"/>
<result property="pictureType" column="picture_type"/>
<result property="pictureTime" column="picture_time"/>
<result property="picturePath" column="picture_path"/>
@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="columns">
<![CDATA[
id,picture_zh,year,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
id,picture_zh,picture_name_en,year,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
]]>
</sql>
<sql id="cloumns_Map">