Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改格式，修改森林数据

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

58
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ChangeTable.java Normal file
View File

@@ -0,0 +1,58 @@
package com.ruoyi.system.domain_yada;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 14:00
*/
public class ChangeTable {
private String id;
private String country;
private String forestloss;
private String forestgain;
private String china;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getForestloss() {
return forestloss;
}
public void setForestloss(String forestloss) {
this.forestloss = forestloss;
}
public String getForestgain() {
return forestgain;
}
public void setForestgain(String forestgain) {
this.forestgain = forestgain;
}
public String getChina() {
return china;
}
public void setChina(String china) {
this.china = china;
}
}

16
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java
View File

@@ -14,7 +14,7 @@ public class CityFocusVO extends SysBaseEntity
private String city;
private String year;
// private String year;
private String xAxisPy;
@@ -56,13 +56,13 @@ public class CityFocusVO extends SysBaseEntity
this.city = city;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
// public String getYear() {
// return year;
// }
//
// public void setYear(String year) {
// this.year = year;
// }
public String getxAxisPy() {
return xAxisPy;

12
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java
View File

@@ -12,6 +12,10 @@ public class CityInformation
* 城市
*/
private String city;
/**
* 城市
*/
private String cityEn;
/**
* 面积
*/
@@ -134,4 +138,12 @@ public class CityInformation
public void setCountry(String country) {
this.country = country;
}
public String getCityEn() {
return cityEn;
}
public void setCityEn(String cityEn) {
this.cityEn = cityEn;
}
}

10
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java
View File

@@ -10,6 +10,8 @@ public class CityVo extends SysBaseEntity
private String city;
private String cityEn;
private String area;
private String year;
@@ -107,4 +109,12 @@ public class CityVo extends SysBaseEntity
public void setSuperior(String superior) {
this.superior = superior;
}
public String getCityEn() {
return cityEn;
}
public void setCityEn(String cityEn) {
this.cityEn = cityEn;
}
}

58
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CloumnarTable.java Normal file
View File

@@ -0,0 +1,58 @@
package com.ruoyi.system.domain_yada;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 14:00
*/
public class CloumnarTable {
private String id;
private String country;
private String year;
private String forestcover;
private String china;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getForestcover() {
return forestcover;
}
public void setForestcover(String forestcover) {
this.forestcover = forestcover;
}
public String getChina() {
return china;
}
public void setChina(String china) {
this.china = china;
}
}

41
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForestDetectionVO.java Normal file
View File

@@ -0,0 +1,41 @@
package com.ruoyi.system.domain_yada;
import java.lang.ref.PhantomReference;
import java.util.List;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 13:56
*/
public class ForestDetectionVO {
private List<ChangeTable> changes;
private List<CloumnarTable> cloumnars;
private List<TypeTable> types;
public List<ChangeTable> getChanges() {
return changes;
}
public void setChanges(List<ChangeTable> changes) {
this.changes = changes;
}
public List<CloumnarTable> getCloumnars() {
return cloumnars;
}
public void setCloumnars(List<CloumnarTable> cloumnars) {
this.cloumnars = cloumnars;
}
public List<TypeTable> getTypes() {
return types;
}
public void setTypes(List<TypeTable> types) {
this.types = types;
}
}

9
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java
View File

@@ -16,6 +16,7 @@ public class OrientationVO extends SysBaseEntity
private String superior;
private String cityEn;
private String country;
@@ -66,4 +67,12 @@ public class OrientationVO extends SysBaseEntity
public void setCountry(String country) {
this.country = country;
}
public String getCityEn() {
return cityEn;
}
public void setCityEn(String cityEn) {
this.cityEn = cityEn;
}
}

30
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java
View File

@@ -10,14 +10,20 @@ public class SpecialVO extends SysBaseEntity
private String fileName;
private String fileNameEn;
private String dateTime;
private String spaceDistinguish;
private String timeDistinguish;
private String timeDistinguishEn;
private String zone;
private String zoneEn;
private String filePath;
public String getId() {
@@ -75,4 +81,28 @@ public class SpecialVO extends SysBaseEntity
public void setFilePath(String filePath) {
this.filePath = filePath;
}
public String getFileNameEn() {
return fileNameEn;
}
public void setFileNameEn(String fileNameEn) {
this.fileNameEn = fileNameEn;
}
public String getZoneEn() {
return zoneEn;
}
public void setZoneEn(String zoneEn) {
this.zoneEn = zoneEn;
}
public String getTimeDistinguishEn() {
return timeDistinguishEn;
}
public void setTimeDistinguishEn(String timeDistinguishEn) {
this.timeDistinguishEn = timeDistinguishEn;
}
}

10
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
View File

@@ -23,6 +23,8 @@ public class ThematicMapDomain extends SysBaseEntity {
private String pictureName;
private String pictureNameEn;
private String pictureType;
private LocalDateTime pictureTime;
@@ -165,4 +167,12 @@ public class ThematicMapDomain extends SysBaseEntity {
public void setYear(String year) {
this.year = year;
}
public String getPictureNameEn() {
return pictureNameEn;
}
public void setPictureNameEn(String pictureNameEn) {
this.pictureNameEn = pictureNameEn;
}
}

5
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeConversion.java Normal file
View File

@@ -0,0 +1,5 @@
package com.ruoyi.system.domain_yada;/**
* @Author: JinSheng Song
* @Date: 2022/11/1 15:17
*/public class TypeConversion {
}

50
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeTable.java Normal file
View File

@@ -0,0 +1,50 @@
package com.ruoyi.system.domain_yada;
import java.time.Period;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 14:00
*/
public class TypeTable {
private String id;
private String class1;
private String percentage;
private String china;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getClass1() {
return class1;
}
public void setClass1(String class1) {
this.class1 = class1;
}
public String getPercentage() {
return percentage;
}
public void setPercentage(String percentage) {
this.percentage = percentage;
}
public String getChina() {
return china;
}
public void setChina(String china) {
this.china = china;
}
}

10
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java
View File

@@ -14,6 +14,8 @@ public class UploadSpecialVO extends SysBaseEntity
private String fileName;
private String fileNameEn;
private String uploadNum;
private String filePath;
@@ -89,4 +91,12 @@ public class UploadSpecialVO extends SysBaseEntity
public void setSign(String sign) {
this.sign = sign;
}
public String getFileNameEn() {
return fileNameEn;
}
public void setFileNameEn(String fileNameEn) {
this.fileNameEn = fileNameEn;
}
}

7
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
View File

@@ -14,8 +14,7 @@ import java.util.List;
public interface CityExpandMapper {
List<CityFocusVO> selectExpand(@Param("city") String city,
@Param("country") String country,
@Param("year") String year);
@Param("country") String country);
List<OrientationVO> selectOrientation( @Param("city") String city,
@Param("superior") String superior,
@@ -23,6 +22,8 @@ public interface CityExpandMapper {
List<CityInformation> selectInfrom(@Param("city") String city,
@Param("country") String country,
@Param("year") String year);
@Param("year") String year,
@Param("basin")String basin);
List<CityInformation> selectMain( @Param("year") String year);
}

20
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ForestDetectionMapper.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ruoyi.system.mapper_yada;
import com.ruoyi.system.domain_yada.ChangeTable;
import com.ruoyi.system.domain_yada.CloumnarTable;
import com.ruoyi.system.domain_yada.TypeTable;
import java.util.List;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 13:54
*/
public interface ForestDetectionMapper {
List<TypeTable> selectType();
List<CloumnarTable> selectCloumnar();
List<ChangeTable> selectChange();
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java
View File

@@ -17,7 +17,7 @@ public interface ICityExpandService {
List<OrientationVO> selectOrientation(String city, String superior,String country);
List<CityInformation> selectInfrom(String city, String country,String year);
List<CityInformation> selectInfrom(String city, String country,String year,String basin);
List<CityInformation> selectMain(String year);
}

20
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IForestDetectionService.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ruoyi.system.service_yada;
import com.ruoyi.system.domain_yada.ChangeTable;
import com.ruoyi.system.domain_yada.CloumnarTable;
import com.ruoyi.system.domain_yada.TypeTable;
import java.util.List;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 13:52
*/
public interface IForestDetectionService {
List<TypeTable> selectType();
List<CloumnarTable> selectCloumnar();
List<ChangeTable> selectChange();
}

6
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java
View File

@@ -26,7 +26,7 @@ public class CityExpandServiceimpl implements ICityExpandService {
@Override
public List<CityFocusVO> selectExpand(String city, String country, String year) {
return mapper.selectExpand(city,country,year);
return mapper.selectExpand(city,country);
}
@Override
@@ -35,8 +35,8 @@ public class CityExpandServiceimpl implements ICityExpandService {
}
@Override
public List<CityInformation> selectInfrom(String city, String country,String year) {
return mapper.selectInfrom(city,country,year);
public List<CityInformation> selectInfrom(String city, String country,String year,String basin) {
return mapper.selectInfrom(city,country,year,basin);
}
@Override

38
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ForestDetectionServiceImpl.java Normal file
View File

@@ -0,0 +1,38 @@
package com.ruoyi.system.service_yada.impl;
import com.ruoyi.system.domain_yada.ChangeTable;
import com.ruoyi.system.domain_yada.CloumnarTable;
import com.ruoyi.system.domain_yada.TypeTable;
import com.ruoyi.system.mapper_yada.ForestDetectionMapper;
import com.ruoyi.system.service_yada.IForestDetectionService;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 13:52
*/
@Service
public class ForestDetectionServiceImpl implements IForestDetectionService {
@Resource
private ForestDetectionMapper mapper;
@Override
public List<TypeTable> selectType() {
return mapper.selectType();
}
@Override
public List<CloumnarTable> selectCloumnar() {
return mapper.selectCloumnar();
}
@Override
public List<ChangeTable> selectChange() {
return mapper.selectChange();
}
}

15
ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
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">

3
ruoyi-system/src/main/resources/mapper/system/CityMapper.xml
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>

26
ruoyi-system/src/main/resources/mapper/system/ForestDetectionMapper.xml Normal file
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>

8
ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
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>

3
ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
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">