测试

2022-06-22 15:43:23 +08:00
parent 1c16fc1d4a
commit 8918116dbd
138 changed files with 4487 additions and 859 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java
@ -0,0 +1,89 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:06
+ */
+public class AorestCoverageVO extends  SysBaseEntity {
+
+    private  String id;
+
+    private  String particularYear;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  Double protectedLands;
+
+    private  Double nonProtectedLands;
+
+    private  Double mountain;
+
+    private  Double nonMountain;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public Double getProtectedLands() {
+        return protectedLands;
+    }
+
+    public void setProtectedLands(Double protectedLands) {
+        this.protectedLands = protectedLands;
+    }
+
+    public Double getNonProtectedLands() {
+        return nonProtectedLands;
+    }
+
+    public void setNonProtectedLands(Double nonProtectedLands) {
+        this.nonProtectedLands = nonProtectedLands;
+    }
+
+    public Double getMountain() {
+        return mountain;
+    }
+
+    public void setMountain(Double mountain) {
+        this.mountain = mountain;
+    }
+
+    public Double getNonMountain() {
+        return nonMountain;
+    }
+
+    public void setNonMountain(Double nonMountain) {
+        this.nonMountain = nonMountain;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java
@ -1,18 +1,18 @@
-package com.ruoyi.system.vo;
+package com.ruoyi.system.domain_yada;

-import javax.xml.crypto.Data;
-import java.lang.ref.PhantomReference;
 import java.time.LocalDate;

 /**
 * @Author: JinSheng Song
 * @Date: 2022/5/19 14:50
 */
-public class AustraliaMiddleEastVO
+public class AustraliaMiddleEastVO extends SysBaseEntity
 {
    private  String id;

-    private LocalDate yearMonth;
+    private String yearMonth;
+
+    private String month;

    private  Double sstAnomalyIndex;

@ -22,16 +22,19 @@ public class AustraliaMiddleEastVO

    private  Double vaiAnomolies;

-    private  String createdBy;
+    public String getId() {
+        return id;
+    }

-    private  String createdTime;
+    public void setId(String id) {
+        this.id = id;
+    }

-
-    public LocalDate getYearMonth() {
+    public String getYearMonth() {
        return yearMonth;
    }

-    public void setYearMonth(LocalDate yearMonth) {
+    public void setYearMonth(String yearMonth) {
        this.yearMonth = yearMonth;
    }

@ -67,27 +70,11 @@ public class AustraliaMiddleEastVO
        this.vaiAnomolies = vaiAnomolies;
    }

-    public String getCreatedBy() {
-        return createdBy;
+    public String getMonth() {
+        return month;
    }

-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setCreatedTime(String createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
+    public void setMonth(String month) {
+        this.month = month;
    }
 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java
@ -0,0 +1,110 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/10 10:04
+ */
+public class CastsVo
+{
+    private String date;
+
+    private  String week;
+
+    private  String  dayweather;
+
+    private  String nightweather;
+
+    private  String  daytemp;
+
+    private  String nighttemp;
+
+    private  String  daywind;
+
+    private  String nightwind;
+
+    private  String  daypower;
+
+    private  String  nightpower;
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getWeek() {
+        return week;
+    }
+
+    public void setWeek(String week) {
+        this.week = week;
+    }
+
+    public String getDayweather() {
+        return dayweather;
+    }
+
+    public void setDayweather(String dayweather) {
+        this.dayweather = dayweather;
+    }
+
+    public String getNightweather() {
+        return nightweather;
+    }
+
+    public void setNightweather(String nightweather) {
+        this.nightweather = nightweather;
+    }
+
+    public String getDaytemp() {
+        return daytemp;
+    }
+
+    public void setDaytemp(String daytemp) {
+        this.daytemp = daytemp;
+    }
+
+    public String getNighttemp() {
+        return nighttemp;
+    }
+
+    public void setNighttemp(String nighttemp) {
+        this.nighttemp = nighttemp;
+    }
+
+    public String getDaywind() {
+        return daywind;
+    }
+
+    public void setDaywind(String daywind) {
+        this.daywind = daywind;
+    }
+
+    public String getNightwind() {
+        return nightwind;
+    }
+
+    public void setNightwind(String nightwind) {
+        this.nightwind = nightwind;
+    }
+
+    public String getDaypower() {
+        return daypower;
+    }
+
+    public void setDaypower(String daypower) {
+        this.daypower = daypower;
+    }
+
+    public String getNightpower() {
+        return nightpower;
+    }
+
+    public void setNightpower(String nightpower) {
+        this.nightpower = nightpower;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java
@ -0,0 +1,69 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/30 8:50
+ */
+//字典表
+public class Dictionary extends SysBaseEntity
+{
+    private  String codingType;
+
+    private  String codingType1;
+
+    private  String codingType2;
+
+    private  String dictionary;
+
+    private String name;
+
+    private  String nameEn;
+
+    public String getCodingType1() {
+        return codingType1;
+    }
+
+    public void setCodingType1(String codingType1) {
+        this.codingType1 = codingType1;
+    }
+
+    public String getCodingType2() {
+        return codingType2;
+    }
+
+    public void setCodingType2(String codingType2) {
+        this.codingType2 = codingType2;
+    }
+
+    public String getCodingType() {
+        return codingType;
+    }
+
+    public void setCodingType(String codingType) {
+        this.codingType = codingType;
+    }
+
+    public String getDictionary() {
+        return dictionary;
+    }
+
+    public void setDictionary(String dictionary) {
+        this.dictionary = dictionary;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java
@ -0,0 +1,62 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/10 10:02
+ */
+public class ForecastVo {
+
+    private  String city;
+
+    private  String adcode;
+
+    private  String province;
+
+    private String reporttime;
+
+    private List<CastsVo> casts;
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAdcode() {
+        return adcode;
+    }
+
+    public void setAdcode(String adcode) {
+        this.adcode = adcode;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getReporttime() {
+        return reporttime;
+    }
+
+    public void setReporttime(String reporttime) {
+        this.reporttime = reporttime;
+    }
+
+    public List<CastsVo> getCasts() {
+        return casts;
+    }
+
+    public void setCasts(List<CastsVo> casts) {
+        this.casts = casts;
+    }
+}
+
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java
@ -0,0 +1,69 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 全球各类型占比
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:07
+ */
+public class GlobalTypeVO extends  SysBaseEntity {
+
+    private  String id;
+
+    private  String typeName;
+
+    private  String  typeNameEn;
+
+    private  Double areaProportion;
+
+    private  Double area;
+
+    private  int  particularYear;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeNameEn() {
+        return typeNameEn;
+    }
+
+    public void setTypeNameEn(String typeNameEn) {
+        this.typeNameEn = typeNameEn;
+    }
+
+    public Double getAreaProportion() {
+        return areaProportion;
+    }
+
+    public void setAreaProportion(Double areaProportion) {
+        this.areaProportion = areaProportion;
+    }
+
+    public Double getArea() {
+        return area;
+    }
+
+    public void setArea(Double area) {
+        this.area = area;
+    }
+
+    public int getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(int particularYear) {
+        this.particularYear = particularYear;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java
@ -0,0 +1,110 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/10 9:57
+ */
+public class LivesVo
+{
+    /**
+     * 省份名
+     */
+    private  String province;
+    /**
+     * 城市名
+     */
+    private  String city;
+    /**
+     * 区域编码
+     */
+    private  String adcode;
+    /**
+     *天气现象
+     */
+    private  String weather;
+
+    private  String temperature;
+
+    private  String winddirection;
+
+    private  String windpower;
+
+    private  String humidity;
+
+    private LocalDateTime reporttime;
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAdcode() {
+        return adcode;
+    }
+
+    public void setAdcode(String adcode) {
+        this.adcode = adcode;
+    }
+
+    public String getWeather() {
+        return weather;
+    }
+
+    public void setWeather(String weather) {
+        this.weather = weather;
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getWinddirection() {
+        return winddirection;
+    }
+
+    public void setWinddirection(String winddirection) {
+        this.winddirection = winddirection;
+    }
+
+    public String getWindpower() {
+        return windpower;
+    }
+
+    public void setWindpower(String windpower) {
+        this.windpower = windpower;
+    }
+
+    public String getHumidity() {
+        return humidity;
+    }
+
+    public void setHumidity(String humidity) {
+        this.humidity = humidity;
+    }
+
+    public LocalDateTime getReporttime() {
+        return reporttime;
+    }
+
+    public void setReporttime(LocalDateTime reporttime) {
+        this.reporttime = reporttime;
+    }
+
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java
@ -0,0 +1,62 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**+
+ * 海面温度监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:08
+ */
+public class OceanTemperatureVO extends SysBaseEntity
+{
+
+    private  String id;
+
+    private  Integer ninoPhenomenon;
+
+    private  Integer  laNina;
+
+    private LocalDate startDate;
+
+    private  LocalDate endDate;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getNinoPhenomenon() {
+        return ninoPhenomenon;
+    }
+
+    public void setNinoPhenomenon(Integer ninoPhenomenon) {
+        this.ninoPhenomenon = ninoPhenomenon;
+    }
+
+    public Integer getLaNina() {
+        return laNina;
+    }
+
+    public void setLaNina(Integer laNina) {
+        this.laNina = laNina;
+    }
+
+    public LocalDate getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDate startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDate getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDate endDate) {
+        this.endDate = endDate;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java
@ -1,7 +1,8 @@
-package com.ruoyi.system.vo;
+package com.ruoyi.system.domain_yada;

 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;

 /**
 * @Author: JinSheng Song
@ -22,11 +23,11 @@ public class RegionVGIVO implements Serializable {

    private  Double grassland;

-    private  Integer particularYear;
+    private  String particularYear;

    private  String createdBy;

-    private LocalDate createdTime;
+    private LocalDateTime createdTime;

    public String getId() {
        return id;
@ -84,11 +85,11 @@ public class RegionVGIVO implements Serializable {
        this.grassland = grassland;
    }

-    public Integer getParticularYear() {
+    public String getParticularYear() {
        return particularYear;
    }

-    public void setParticularYear(Integer particularYear) {
+    public void setParticularYear(String particularYear) {
        this.particularYear = particularYear;
    }

@ -100,11 +101,11 @@ public class RegionVGIVO implements Serializable {
        this.createdBy = createdBy;
    }

-    public LocalDate getCreatedTime() {
+    public LocalDateTime getCreatedTime() {
        return createdTime;
    }

-    public void setCreatedTime(LocalDate createdTime) {
+    public void setCreatedTime(LocalDateTime createdTime) {
        this.createdTime = createdTime;
    }

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java
@ -0,0 +1,80 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:09
+ */
+
+public class RegionalSystemVO  extends SysBaseEntity{
+
+    private  String id;
+
+    private  String region;
+
+    private  String  regionEn;
+
+    private  String typeConversion;
+
+    private  String typeconversionEn;
+
+    private  Double  proportionOfChangedAreas;
+
+    private  String particularYear;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getTypeConversion() {
+        return typeConversion;
+    }
+
+    public void setTypeConversion(String typeConversion) {
+        this.typeConversion = typeConversion;
+    }
+
+    public String getTypeconversionEn() {
+        return typeconversionEn;
+    }
+
+    public void setTypeconversionEn(String typeconversionEn) {
+        this.typeconversionEn = typeconversionEn;
+    }
+
+    public Double getProportionOfChangedAreas() {
+        return proportionOfChangedAreas;
+    }
+
+    public void setProportionOfChangedAreas(Double proportionOfChangedAreas) {
+        this.proportionOfChangedAreas = proportionOfChangedAreas;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java
@ -1,9 +1,7 @@
-package com.ruoyi.system.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+package com.ruoyi.system.domain_yada;

 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;

@ -20,15 +18,13 @@ public class SysBaseEntity implements Serializable
    private String createBy;

    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;

    /** 更新者 */
    private String updateBy;

    /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;

    /** 备注 */
    private String remark;
@ -46,13 +42,11 @@ public class SysBaseEntity implements Serializable
        this.createBy = createBy;
    }

-    public Date getCreateTime()
-    {
+    public LocalDateTime getCreateTime() {
        return createTime;
    }

-    public void setCreateTime(Date createTime)
-    {
+    public void setCreateTime(LocalDateTime createTime) {
        this.createTime = createTime;
    }

@ -66,13 +60,11 @@ public class SysBaseEntity implements Serializable
        this.updateBy = updateBy;
    }

-    public Date getUpdateTime()
-    {
+    public LocalDateTime getUpdateTime() {
        return updateTime;
    }

-    public void setUpdateTime(Date updateTime)
-    {
+    public void setUpdateTime(LocalDateTime updateTime) {
        this.updateTime = updateTime;
    }

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
@ -0,0 +1,158 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDateTime;
+
+/**
+ * 专题图实体类
+ * @Author: taco chen
+ * @Date: 2022/5/20 14:09
+ */
+public class ThematicMapDomain extends SysBaseEntity {
+
+    private Long id;
+
+    private String pictureCode;
+
+    private String pictureTypeOne;
+
+    private  String pictureTypeTwo;
+
+    private String pictureZh;
+
+    private String pictureEn;
+
+    private String pictureName;
+
+    private String pictureType;
+
+    private LocalDateTime pictureTime;
+
+    private String picturePath;
+
+    private String remarks;
+
+    private String createdBy;
+
+    private LocalDateTime createdTime;
+
+    public String getPictureCode() {
+        return pictureCode;
+    }
+
+    public void setPictureCode(String pictureCode) {
+        this.pictureCode = pictureCode;
+    }
+
+    public String getPictureTypeOne() {
+        return pictureTypeOne;
+    }
+
+    public void setPictureTypeOne(String pictureTypeOne) {
+        this.pictureTypeOne = pictureTypeOne;
+    }
+
+    public String getPictureTypeTwo() {
+        return pictureTypeTwo;
+    }
+
+    public void setPictureTypeTwo(String pictureTypeTwo) {
+        this.pictureTypeTwo = pictureTypeTwo;
+    }
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPictureZh() {
+        return pictureZh;
+    }
+
+    public void setPictureZh(String pictureZh) {
+        this.pictureZh = pictureZh;
+    }
+
+    public String getPictureEn() {
+        return pictureEn;
+    }
+
+    public void setPictureEn(String pictureEn) {
+        this.pictureEn = pictureEn;
+    }
+
+    public String getPictureName() {
+        return pictureName;
+    }
+
+    public void setPictureName(String pictureName) {
+        this.pictureName = pictureName;
+    }
+
+    public String getPictureType() {
+        return pictureType;
+    }
+
+    public void setPictureType(String pictureType) {
+        this.pictureType = pictureType;
+    }
+
+    public LocalDateTime getPictureTime() {
+        return pictureTime;
+    }
+
+    public void setPictureTime(LocalDateTime pictureTime) {
+        this.pictureTime = pictureTime;
+    }
+
+    public String getPicturePath() {
+        return picturePath;
+    }
+
+    public void setPicturePath(String picturePath) {
+        this.picturePath = picturePath;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public LocalDateTime getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(LocalDateTime createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ThematicMapDomain{" +
+                "id=" + id +
+                ", pictureZh='" + pictureZh + '\'' +
+                ", pictureEn='" + pictureEn + '\'' +
+                ", pictureName='" + pictureName + '\'' +
+                ", pictureType='" + pictureType + '\'' +
+                ", pictureTime=" + pictureTime +
+                ", picturePath='" + picturePath + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdTime=" + createdTime +
+                '}';
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java
@ -0,0 +1,60 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/24 14:24
+ */
+public class UploadFile  extends  SysBaseEntity
+{
+    private  String id;
+
+    private String fileId;
+
+    private  String fileName;
+
+    private  String filePath;
+
+    private  String  fileSize;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFileId() {
+        return fileId;
+    }
+
+    public void setFileId(String fileId) {
+        this.fileId = fileId;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java
@ -0,0 +1,61 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 16:55
+ */
+public class UrbanVO extends SysBaseEntity{
+
+    private  String id;
+
+    private String particularYear;
+
+    private  String name;
+
+    private  String  nameEn;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    public Double getUrbanArea() {
+        return urbanArea;
+    }
+
+    public void setUrbanArea(Double urbanArea) {
+        this.urbanArea = urbanArea;
+    }
+
+    private  Double urbanArea;
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
@ -0,0 +1,91 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:09
+ */
+public class VegetationCoverageVO extends SysBaseEntity
+{
+    private  String id;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  String particularYear;
+
+    private  Double mountain;
+
+    private  Double nonMountain;
+
+    private  Double protectedLands;
+
+    private  Double nonProtectedLands;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public Double getMountain() {
+        return mountain;
+    }
+
+    public void setMountain(Double mountain) {
+        this.mountain = mountain;
+    }
+
+    public Double getNonMountain() {
+        return nonMountain;
+    }
+
+    public void setNonMountain(Double nonMountain) {
+        this.nonMountain = nonMountain;
+    }
+
+    public Double getProtectedLands() {
+        return protectedLands;
+    }
+
+    public void setProtectedLands(Double protectedLands) {
+        this.protectedLands = protectedLands;
+    }
+
+    public Double getNonProtectedLands() {
+        return nonProtectedLands;
+    }
+
+    public void setNonProtectedLands(Double nonProtectedLands) {
+        this.nonProtectedLands = nonProtectedLands;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java
@ -0,0 +1,85 @@
+package com.ruoyi.system.domain_yada;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/10 9:53
+ */
+public class WeatherUtilsVO {
+    /**
+     * 接口返回状态
+     */
+    private  String status;
+    /**
+     * 返回结果数量
+     */
+    private  String count;
+
+    private  String info;
+
+    private  String infocode;
+    /**
+     * 实时天气预报
+     */
+    private  List<LivesVo> lives;
+    /**
+     * 预报天气
+     */
+    private List<ForecastVo> forecasts;
+
+//    /**
+//     * 预报天气
+//     */
+//    private  String forecasts;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getCount() {
+        return count;
+    }
+
+    public void setCount(String count) {
+        this.count = count;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getInfocode() {
+        return infocode;
+    }
+
+    public void setInfocode(String infocode) {
+        this.infocode = infocode;
+    }
+
+
+
+    public List<ForecastVo> getForecasts() {
+        return forecasts;
+    }
+
+    public void setForecasts(List<ForecastVo> forecasts) {
+        this.forecasts = forecasts;
+    }
+
+    public List<LivesVo> getLives() {
+        return lives;
+    }
+
+    public void setLives(List<LivesVo> lives) {
+        this.lives = lives;
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java
@ -1,8 +0,0 @@
-package com.ruoyi.system.mapper;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 15:17
- */
-public interface AdahTestingMapper {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java
@ -1,8 +0,0 @@
-package com.ruoyi.system.mapper;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 15:17
- */
-public interface AtmosphereMapper {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java
@ -1,8 +0,0 @@
-package com.ruoyi.system.mapper;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 15:18
- */
-public interface ENSOMapper {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java
@ -1,8 +0,0 @@
-package com.ruoyi.system.mapper;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 15:18
- */
-public interface ForestMapper {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java
@ -1,8 +0,0 @@
-package com.ruoyi.system.mapper;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 15:18
- */
-public interface GlobalEcologyMapper {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java
@ -1,8 +0,0 @@
-package com.ruoyi.system.mapper;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 15:18
- */
-public interface UrbanMapper {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
@ -0,0 +1,29 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import com.ruoyi.system.domain_yada.Dictionary;
+import com.ruoyi.system.domain_yada.UploadFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AorestCoverageMapper {
+
+    List<AorestCoverageVO> selectAorestCoverage(/*@Param("region") String region,
+                                                @Param("particularYear") String particularYear*/);
+
+    Integer DelAorestCoverage(@Param("id") String id);
+
+    Integer IntoAorestCoverage(AorestCoverageVO eastVO);
+
+    Integer IntoUpload(UploadFile file);
+
+    List<UploadFile> selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName);
+
+    List<Dictionary> selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1,
+                               @Param("codingType2") String codingType2);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java
@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.system.mapper_yada;

-import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
 import org.apache.ibatis.annotations.Param;


@ -13,7 +13,8 @@ import java.util.List;
 */
 public interface AustraliaMiddleEastMapper {

-    List<AustraliaMiddleEastVO> selectAustralia();
+    List<AustraliaMiddleEastVO> selectAustralia(@Param("yearMonth") String yearMonth,
+                                                @Param("month") String month);

    Integer DelAustralia(@Param("id") String id);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java
@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface GlobalTypeMapper {
+
+    List<GlobalTypeVO> selectGlobalType(@Param("typeName") String typeName, @Param("particularYear") Integer particularYear);
+
+    Integer DelGlobalType(@Param("id") String id);
+
+    Integer IntoGlobalType(GlobalTypeVO typeVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java
@ -0,0 +1,23 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+@Repository
+public interface OceanTemperatureMapper {
+
+    List<OceanTemperatureVO> selectOcean(@Param("startDate") LocalDate startDate);
+
+    Integer DelOcean(@Param("id") String id);
+
+    Integer IntoOcean(OceanTemperatureVO eastVO);
+
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java
@ -1,7 +1,6 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.system.mapper_yada;

-import com.ruoyi.system.vo.AustraliaMiddleEastVO;
-import com.ruoyi.system.vo.RegionVGIVO;
+import com.ruoyi.system.domain_yada.RegionVGIVO;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
@ -12,7 +11,8 @@ import java.util.List;
 */
 public interface RegionVGIMapper {

-    List<RegionVGIVO> selectRegion();
+    List<RegionVGIVO> selectRegion(/*@Param("typeName") String typeName,
+                                   @Param("particularYear") String particularYear*/);

    Integer DelRegion(@Param("id") String id);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java
@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface RegionalSystemMapper {
+
+    List<RegionalSystemVO> selectRegional(@Param("region") String region);
+
+    Integer DelRegional(@Param("id") String id);
+
+    Integer IntoRegional(RegionalSystemVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
@ -0,0 +1,38 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author taco chen
+ */
+public interface ThematicMapMapper {
+
+    /**
+     * 获取所有专题图
+     * @return
+     */
+    List<ThematicMapDomain> selectAllThematicMap(@Param("pictureType") String pictureType,
+                                                 @Param("pictureTypeOne") String pictureTypeOne,
+                                                 @Param("pictureTypeTwo") String pictureTypeTwo);
+
+    /**
+     * 删除专题图根据编号
+     * @param id 编号
+     * @return
+     */
+    Integer deleteThematicMap(Long id);
+
+    /**
+     * 保存专题图
+     * @param thematicMapDomain
+     * @return
+     */
+    Integer saveThematicMap(ThematicMapDomain thematicMapDomain);
+
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java
@ -0,0 +1,21 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.UrbanVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface UrbanMapper {
+
+    List<UrbanVO> selectUrban(@Param("name") String name,
+                              @Param("particularYear") String particularYear);
+
+    Integer DelUrban(@Param("id") String id);
+
+    Integer IntoUrban(UrbanVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface VegetationCoverageMapper {
+
+    List<VegetationCoverageVO> selectVegetation(/*@Param("region") String region,
+                                                @Param("particularYear") String particularYear*/);
+
+    Integer DelVegetation(@Param("id") String id);
+
+    Integer IntoVegetation(VegetationCoverageVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java
@ -1,9 +0,0 @@
-package com.ruoyi.system.service;
-
-/**
- * 亚大综合监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:32
- */
-public interface IAdahTestingService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java
@ -1,9 +0,0 @@
-package com.ruoyi.system.service;
-
-/**
- * 大气质量监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:34
- */
-public interface IAtmosphereService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java
@ -1,9 +0,0 @@
-package com.ruoyi.system.service;
-
-/**
- * ENSO影响监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:35
- */
-public interface IENSOService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java
@ -1,9 +0,0 @@
-package com.ruoyi.system.service;
-
-/**
- * 森林监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:38
- */
-public interface IForestService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java
@ -1,9 +0,0 @@
-package com.ruoyi.system.service;
-
-/**
- * 全球生态环境监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:37
- */
-public interface IGlobalEcologyService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRegionVGIService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRegionVGIService.java
@ -1,20 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.vo.AustraliaMiddleEastVO;
-import com.ruoyi.system.vo.RegionVGIVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:34
- */
-public interface IRegionVGIService {
-
-    public List<RegionVGIVO> selectRegion();
-
-    public Integer DelRegion(@Param("id") String id);
-
-    public Integer IntoRegion(RegionVGIVO eastVO);
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java
@ -1,9 +0,0 @@
-package com.ruoyi.system.service;
-
-/**
- * 城市监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:40
- */
-public interface IUrbanService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java
@ -1,11 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.service.IAdahTestingService;
-
-/**
- * 亚大综合监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:43
- */
-public class AdahTestingServiceimpl implements IAdahTestingService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java
@ -1,11 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.service.IAtmosphereService;
-
-/**
- * 大气质量监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:45
- */
-public class AtmosphereServiceimpl  implements IAtmosphereService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java
@ -1,11 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.service.IENSOService;
-
-/**
- * ENSO影响监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:46
- */
-public class ENSOServiceimpl implements IENSOService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java
@ -1,11 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.service.IForestService;
-
-/**
- * 森林监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:47
- */
-public class ForestServiceimpl implements IForestService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java
@ -1,11 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.service.IGlobalEcologyService;
-
-/**
- * 全球生态环境监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:47
- */
-public class GlobalEcologyServiceimpl implements IGlobalEcologyService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java
@ -1,11 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.service.IUrbanService;
-
-/**
- * * 城市监测
- * @Author: JinSheng Song
- * @Date: 2022/5/11 11:49
- */
-public class UrbanServiceimpl implements IUrbanService {
-}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
@ -0,0 +1,31 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.Dictionary;
+import com.ruoyi.system.domain_yada.UploadFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAorestCoverageService {
+
+    public List<AorestCoverageVO> selectAorestCoverage(/*String region,String particularYear*/);
+
+    public Integer DelAorestCoverage(String id);
+
+    public Integer IntoAorestCoverage(AorestCoverageVO eastVO);
+
+    public Integer IntoUpload(UploadFile file);
+
+    public List<UploadFile> selectUpload(String fileId,String fileName);
+
+    List<Dictionary> selectDic(String codingType,String codingType1,
+                                String codingType2);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java
@ -1,6 +1,6 @@
-package com.ruoyi.system.service;
+package com.ruoyi.system.service_yada;

-import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
@ -12,7 +12,7 @@ import java.util.List;
 */
 public interface IAustraliaMiddleEastService
 {
-    public  List<AustraliaMiddleEastVO> selectAustralia();
+    public  List<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month);

    public Integer DelAustralia(@Param("id") String id);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java
@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 全球各类型占比
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:37
+ */
+public interface IGlobalTypeService {
+
+   public List<GlobalTypeVO> selectGlobalType(String typeName,  Integer particularYear);
+
+   public   Integer DelGlobalType(String id);
+
+   public Integer IntoGlobalType(GlobalTypeVO typeVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java
@ -0,0 +1,22 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 海面表面温度监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:38
+ */
+public interface IOceanTemperatureService {
+
+    public List<OceanTemperatureVO> selectOcean(LocalDate startDate);
+
+    public Integer DelOcean(@Param("id") String id);
+
+    public Integer IntoOcean(OceanTemperatureVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java
@ -0,0 +1,33 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IRegionVGIService {
+
+    /**
+     * 查询
+     * @return
+     */
+    public List<RegionVGIVO> selectRegion(/*String typeName,String particularYear*/);
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    public Integer DelRegion(@Param("id") String id);
+
+    /**
+     * 添加
+     * @param eastVO
+     * @return
+     */
+    public Integer IntoRegion(RegionVGIVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java
@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:35
+ */
+public interface IRegionalSystemService {
+
+    public List<RegionalSystemVO> selectRegional(String region);
+
+    public Integer DelRegional(@Param("id") String id);
+
+    public Integer IntoRegional(RegionalSystemVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
@ -1,4 +1,4 @@
-package com.ruoyi.system.service;
+package com.ruoyi.system.service_yada;

 /**
 * 专题报告
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java
@ -0,0 +1,20 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.UrbanVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:40
+ */
+public interface IUrbanService {
+
+    public List<UrbanVO> selectUrban(String name, String particularYear);
+
+    public Integer DelUrban(@Param("id") String id);
+
+    public Integer IntoUrban(UrbanVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IVegetationCoverageService {
+
+    public List<VegetationCoverageVO> selectVegetation(/*String region,String particularYear*/);
+
+    public Integer DelVegetation(String id);
+
+    public Integer IntoVegetation(VegetationCoverageVO eastVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
@ -0,0 +1,37 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 专题图服务
+ * @Author: taco chen
+ * @Date: 2022/5/11 11:40
+ */
+public interface ThematicMapService {
+
+
+    /**
+     * 获取全部专题图
+     * @return
+     */
+    List<ThematicMapDomain> selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo);
+
+    /**
+     * 删除专题图根据编号
+     * @param id 编号
+     * @return
+     */
+    Integer deleteById(Long id);
+
+    /**
+     * 保存专题图
+     * @param thematicMapDomain
+     * @return
+     */
+    Integer save(ThematicMapDomain thematicMapDomain);
+
+
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
@ -0,0 +1,58 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.Dictionary;
+import com.ruoyi.system.domain_yada.UploadFile;
+import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.service_yada.IAorestCoverageService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+@Service
+public class AorestCoverageServiceimpl implements IAorestCoverageService {
+    @Resource
+    private AorestCoverageMapper coverageMapper;
+
+
+    @Override
+    public List<AorestCoverageVO> selectAorestCoverage(/*String region,String particularYear*/) {
+        return coverageMapper.selectAorestCoverage(/*region,particularYear*/);
+    }
+
+    @Override
+    public Integer DelAorestCoverage(String id) {
+        return coverageMapper.DelAorestCoverage(id);
+    }
+
+    @Override
+    public Integer IntoAorestCoverage(AorestCoverageVO eastVO) {
+        return coverageMapper.IntoAorestCoverage(eastVO);
+    }
+
+    @Override
+    public Integer IntoUpload(UploadFile file) {
+        return coverageMapper.IntoUpload(file);
+    }
+
+    @Override
+    public List<UploadFile> selectUpload(String fileId, String fileName) {
+        return coverageMapper.selectUpload(fileId,fileName);
+    }
+
+    @Override
+    public List<Dictionary> selectDic(String codingType,String codingType1,
+                                      String codingType2) {
+        return  coverageMapper.selectDic(codingType,codingType1,codingType2);
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java
@ -1,11 +1,12 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.system.service_yada.impl;

-import com.ruoyi.system.mapper.AustraliaMiddleEastMapper;
-import com.ruoyi.system.mapper.SysLogininforMapper;
-import com.ruoyi.system.service.IAustraliaMiddleEastService;
-import com.ruoyi.system.vo.AustraliaMiddleEastVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;

+import javax.annotation.Resource;
 import java.util.List;

 /**
@ -13,15 +14,16 @@ import java.util.List;
 * @Author: JinSheng Song
 * @Date: 2022/5/11 11:43
 */
+@Service
 public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService
 {
-    @Autowired
+    @Resource
    private AustraliaMiddleEastMapper australiaMiddleEastMapper;

    @Override
-    public List<AustraliaMiddleEastVO> selectAustralia()
+    public List<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month)
    {
-        return australiaMiddleEastMapper.selectAustralia();
+        return australiaMiddleEastMapper.selectAustralia(yearMonth,month);
    }

    @Override
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java
@ -0,0 +1,42 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.GlobalTypeMapper;
+import com.ruoyi.system.service_yada.IGlobalTypeService;
+import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 全球各类型占比
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+@Service
+public class GlobalTypeServiceimpl implements IGlobalTypeService {
+
+    @Resource
+    private GlobalTypeMapper typeMapper;
+
+
+    @Override
+    public List<GlobalTypeVO> selectGlobalType(String typeName,  Integer particularYear) {
+        return typeMapper.selectGlobalType(typeName, particularYear);
+    }
+
+    @Override
+    public Integer DelGlobalType(String id) {
+        return typeMapper.DelGlobalType(id);
+    }
+
+    @Override
+    public Integer IntoGlobalType(GlobalTypeVO typeVO) {
+        return typeMapper.IntoGlobalType(typeVO);
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java
@ -0,0 +1,41 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.OceanTemperatureMapper;
+import com.ruoyi.system.service_yada.IOceanTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+@Service
+public class OceanTemperatureServiceimpl implements IOceanTemperatureService {
+
+    @Resource
+    private OceanTemperatureMapper oceanMapper;
+
+
+    @Override
+    public List<OceanTemperatureVO> selectOcean(LocalDate startDate) {
+        return oceanMapper.selectOcean(startDate);
+    }
+
+    @Override
+    public Integer DelOcean(String id) {
+        return oceanMapper.DelOcean(id);
+    }
+
+    @Override
+    public Integer IntoOcean(OceanTemperatureVO eastVO) {
+        return oceanMapper.IntoOcean(eastVO);
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
@ -1,11 +1,13 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.system.service_yada.impl;

-import com.ruoyi.system.mapper.AustraliaMiddleEastMapper;
-import com.ruoyi.system.mapper.RegionVGIMapper;
-import com.ruoyi.system.service.IRegionVGIService;
-import com.ruoyi.system.vo.RegionVGIVO;
+import com.ruoyi.system.mapper_yada.RegionVGIMapper;
+import com.ruoyi.system.service_yada.IRegionVGIService;
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;

+import javax.annotation.Resource;
 import java.util.List;

 /**
@ -13,14 +15,15 @@ import java.util.List;
 * @Author: JinSheng Song
 * @Date: 2022/5/11 11:45
 */
+@Service
 public class RegionVGIServiceimpl implements IRegionVGIService {

-    @Autowired
+    @Resource
    private RegionVGIMapper vgiMapper;

    @Override
-    public List<RegionVGIVO> selectRegion() {
-        return vgiMapper.selectRegion();
+    public List<RegionVGIVO> selectRegion(/*String typeName,String particularYear*/) {
+        return vgiMapper.selectRegion(/*typeName,particularYear*/);
    }

    @Override
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
@ -0,0 +1,42 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.RegionalSystemMapper;
+import com.ruoyi.system.service_yada.IRegionalSystemService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:46
+ */
+@Service
+public class RegionalSystemServiceimpl implements IRegionalSystemService {
+
+    @Resource
+    private RegionalSystemMapper Regional;
+
+
+    @Override
+    public List<RegionalSystemVO> selectRegional(String region) {
+        return Regional.selectRegional(region);
+    }
+
+    @Override
+    public Integer DelRegional(String id) {
+        return Regional.DelRegional(id);
+    }
+
+    @Override
+    public Integer IntoRegional(RegionalSystemVO eastVO) {
+        return Regional.IntoRegional(eastVO);
+    }
+
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
@ -1,6 +1,6 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.system.service_yada.impl;

-import com.ruoyi.system.service.ISpecialReportService;
+import com.ruoyi.system.service_yada.ISpecialReportService;

 /**
 * 专题报告
@ -8,4 +8,5 @@ import com.ruoyi.system.service.ISpecialReportService;
 * @Date: 2022/5/11 11:48
 */
 public class SpecialReportServiceimpl  implements ISpecialReportService {
+
 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java
@ -0,0 +1,51 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+import com.ruoyi.system.mapper_yada.ThematicMapMapper;
+import com.ruoyi.system.service_yada.ThematicMapService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * * 专题图服务
+ * @author : taco chen
+ */
+@Service
+public class ThematicMapServiceImpl implements ThematicMapService {
+
+    @Resource
+    private ThematicMapMapper thematicMapMapper;
+
+    /**
+     * 获取全部专题图
+     * @return
+     */
+    @Override
+    public List<ThematicMapDomain> selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo){
+        return thematicMapMapper.selectAllThematicMap(pictureType,pictureTypeOne,pictureTypeTwo);
+    }
+
+    /**
+     * 删除专题图根据编号
+     * @param id 编号
+     * @return
+     */
+    @Override
+    public Integer deleteById(Long id){
+        return thematicMapMapper.deleteThematicMap(id);
+    }
+
+    /**
+     * 保存专题图
+     * @param thematicMapDomain
+     * @return
+     */
+    @Override
+    public Integer save(ThematicMapDomain thematicMapDomain){
+        return thematicMapMapper.saveThematicMap(thematicMapDomain);
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java
@ -0,0 +1,40 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.UrbanVO;
+import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
+import com.ruoyi.system.mapper_yada.UrbanMapper;
+import com.ruoyi.system.service_yada.IUrbanService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:49
+ */
+@Service
+public class UrbanServiceimpl implements IUrbanService {
+
+    @Resource
+    private UrbanMapper urbanMapper;
+
+    @Override
+
+    public List<UrbanVO> selectUrban(String name, String particularYear) {
+        return urbanMapper.selectUrban(name,particularYear);
+    }
+
+    @Override
+    public Integer DelUrban(String id) {
+        return urbanMapper.DelUrban(id);
+    }
+
+    @Override
+    public Integer IntoUrban(UrbanVO eastVO) {
+        return urbanMapper.IntoUrban(eastVO);
+    }
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
@ -0,0 +1,42 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.VegetationCoverageMapper;
+import com.ruoyi.system.service_yada.IVegetationCoverageService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+@Service
+public class VegetationCoverageServiceimpl implements IVegetationCoverageService {
+
+
+    @Resource
+    private VegetationCoverageMapper coverageMapper;
+
+
+    @Override
+    public List<VegetationCoverageVO> selectVegetation(/*String region,String particularYear*/) {
+        return coverageMapper.selectVegetation(/*region,particularYear*/);
+    }
+
+    @Override
+    public Integer DelVegetation(String id) {
+        return coverageMapper.DelVegetation(id);
+    }
+
+    @Override
+    public Integer IntoVegetation(VegetationCoverageVO eastVO) {
+        return coverageMapper.IntoVegetation(eastVO);
+    }
+}
--- a/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml
@ -1,8 +0,0 @@
-<?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.AdahTestingMapper">
-
-
-</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
@ -0,0 +1,146 @@
+<?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.AorestCoverageMapper">
+
+    <resultMap id="RM_AorestCoverage" type="com.ruoyi.system.domain_yada.AorestCoverageVO">
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="region" column="region"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="protectedLands" column="protected_lands"/>
+        <result property="nonProtectedLands" column="non_protected_lands"/>
+        <result property="mountain" column="mountain"/>
+        <result property="nonMountain" column="non_mountain"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,region,region_en,protected_lands,non_protected_lands,mountain,non_mountain,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectAorestCoverage" resultMap="RM_AorestCoverage">
+        SELECT  <include refid="columns"/>  FROM  forest_coverage
+<!--    WHERE 1=1-->
+<!--        <if test="particularYear!= null and particularYear !=''">-->
+<!--        AND particular_year = #{particularYear}-->
+<!--        </if>-->
+<!--        <if test="region!= null and region !=''">-->
+<!--            AND region = #{typeName}-->
+<!--        </if>-->
+    </select>
+
+    <delete id="DelAorestCoverage">
+        DELETE FROM forest_coverage
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoAorestCoverage">
+        <![CDATA[
+        INSERT INTO forest_coverage (
+            particular_year ,
+            region ,
+            region_en ,
+            protected_lands ,
+            non_protected_lands ,
+            mountain,
+            non_mountain,
+            created_by,
+            created_time
+        ) VALUES (
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{protectedLands,jdbcType=DOUBLE},
+                     #{nonProtectedLands,jdbcType=DOUBLE},
+                     #{mountain,jdbcType=DOUBLE},
+                     #{nonMountain,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                    #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+
+    <resultMap id="RM_Upload" type="com.ruoyi.system.domain_yada.UploadFile">
+        <result property="id" column="id"/>
+        <result property="fileId" column="file_id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="fileSize" column="file_size"/>
+        <result property="filePath" column="file_path"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <insert id="IntoUpload">
+        <![CDATA[
+        INSERT INTO sys_file_info (
+            id ,
+            file_id ,
+            file_name ,
+            file_size ,
+            file_path ,
+            created_by,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{fileId,jdbcType=VARCHAR},
+                     #{fileName,jdbcType=VARCHAR},
+                     #{fileSize,jdbcType=VARCHAR},
+                     #{filePath,jdbcType=VARCHAR},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+
+    <select id="selectUpload" resultMap="RM_Upload">
+        SELECT  file_id,file_name,file_size,file_path,created_by,created_time  FROM  sys_file_info
+        WHERE 1=1
+        <if test="fileId!= null and fileId !=''">
+            AND fileId = #{fileId}
+        </if>
+        <if test="fileName!= null and fileName !=''">
+            AND file_name = #{fileName}
+        </if>
+    </select>
+
+    <resultMap id="RM_Dictionary" type="com.ruoyi.system.domain_yada.Dictionary">
+        <result property="codingType" column="coding_type"/>
+        <result property="codingType1" column="codingType1"/>
+        <result property="codingType2" column="codingType2"/>
+        <result property="dictionary" column="dictionary"/>
+        <result property="name" column="name"/>
+        <result property="nameEn" column="name_en"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columnsdic">
+	    <![CDATA[
+        coding_type,dictionary,name,name_En,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectDic" resultMap="RM_Dictionary">
+        select <include refid="columnsdic"/> from dictionary
+        where dictionary in
+              (SELECT A.dictionary FROM dictionary a
+               join (select dictionary from dictionary
+               where 1=1
+                <if test="codingType!= null and codingType !=''">
+                    AND coding_type = #{codingType}
+                </if>
+                <if test="codingType1!= null and codingType1 !=''">
+                    AND dictionary = #{codingType1}
+                </if>
+                   ) b on a.coding_type=b.dictionary
+                <if test="codingType2!= null and codingType2 !=''">
+                    AND a.dictionary = #{codingType2}
+                </if>
+                          )
+    </select>
+</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml
@ -1,8 +0,0 @@
-<?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.AtmosphereMapper">
-
-
-</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml
@ -2,28 +2,36 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.AustraliaMiddleEastMapper">
-    <resultMap id="RM_AustraliaMiddleEast" type="com.ruoyi.system.vo.AustraliaMiddleEastVO">
+<mapper namespace="com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper">
+    <resultMap id="RM_AustraliaMiddleEast" type="com.ruoyi.system.domain_yada.AustraliaMiddleEastVO">

-        <result property="yearMonth" column="year_month"/>
+        <result property="yearMonth" column="particular_month"/>
+        <result property="month" column="month"/>
        <result property="id" column="ID"/>
        <result property="sstAnomalyIndex" column="sst_anomaly_index"/>
        <result property="temperatureAnomolies" column="temperature_anomolies"/>
        <result property="precipitationAnomolies" column="precipitation_anomolies"/>
        <result property="vaiAnomolies" column="vai_anomolies"/>
-        <result property="createdBy" column="created_by"/>
-        <result property="createdTime" column="created_time"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>

    </resultMap>

    <sql id="columns">
 	    <![CDATA[
-        ID,year_month,sst_anomaly_index,temperature_anomolies,precipitation_anomolies,vai_anomolies,created_by,created_time
+        ID,particular_month,sst_anomaly_index,temperature_anomolies,precipitation_anomolies,vai_anomolies,created_by,created_time,month
        ]]>
 	</sql>

    <select id="selectAustralia" resultMap="RM_AustraliaMiddleEast">
-        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia;
+        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia
+        WHERE 1=1
+        <if test="yearMonth!= null and yearMonth !=''">
+            AND particular_month = #{yearMonth}
+        </if>
+        <if test="month!= null and month !=''">
+            AND month = #{month}
+        </if>
    </select>

    <delete id="DelAustralia">
@ -34,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <insert id="IntoAustralia">
        <![CDATA[
        INSERT INTO central_and_eastern_australia (
-            ID ,
-            year_month ,
+            particular_month ,
+            month,
            sst_anomaly_index ,
            temperature_anomolies ,
            precipitation_anomolies ,
@ -43,14 +51,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            created_by ,
            created_time
        ) VALUES (
-                     #{id,jdbcType=VARCHAR},
-                     #{yearMonth,jdbcType=DATE},
+                     #{yearMonth,jdbcType=VARCHAR},
+                     #{month,jdbcType=VARCHAR},
                     #{sstAnomalyIndex,jdbcType=DOUBLE},
                     #{temperatureAnomolies,jdbcType=DOUBLE},
                     #{precipitationAnomolies,jdbcType=DOUBLE},
                     #{vaiAnomolies,jdbcType=DOUBLE},
-                     #{createdBy,jdbcType=VARCHAR},
-                     #{createdTime,jdbcType=VARCHAR}
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=TIMESTAMP}
                 )
        ]]>
    </insert>
--- a/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml
@ -1,8 +0,0 @@
-<?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.ENSOMapper">
-
-
-</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml
@ -1,8 +0,0 @@
-<?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.ForestMapper">
-
-
-</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml
@ -1,7 +0,0 @@
-<?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.GlobalEcologyMapper">
-
-</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
@ -0,0 +1,63 @@
+<?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.GlobalTypeMapper">
+
+    <resultMap id="RM_GlobalType" type="com.ruoyi.system.domain_yada.GlobalTypeVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typeNameEn" column="type_name_en"/>
+        <result property="areaProportion" column="area_proportion"/>
+        <result property="area" column="area"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time
+        ]]>
+	</sql>
+    <select id="selectGlobalType" resultMap="RM_GlobalType">
+        SELECT  <include refid="columns"/>  FROM  proportion_of_global_types
+        WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+        <if test="typeName!= null and typeName !=''">
+            AND type_name = #{typeName}
+        </if>
+    </select>
+
+    <delete id="DelGlobalType">
+        DELETE FROM proportion_of_global_types
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoGlobalType">
+        <![CDATA[
+        INSERT INTO proportion_of_global_types (
+            id ,
+            particular_year ,
+            type_name ,
+            type_name_en ,
+            area_proportion ,
+            area ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{typeName,jdbcType=VARCHAR},
+                     #{typeNameEn,jdbcType=VARCHAR},
+                     #{areaProportion,jdbcType=DOUBLE},
+                     #{area,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml
@ -0,0 +1,60 @@
+<?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.OceanTemperatureMapper">
+
+    <resultMap id="RM_Ocean" type="com.ruoyi.system.domain_yada.OceanTemperatureVO">
+
+        <result property="id" column="id"/>
+        <result property="ninoPhenomenon" column="nino_phenomenon"/>
+        <result property="laNina" column="la_nina"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,nino_phenomenon,la_nina,start_date,end_date,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectOcean" resultMap="RM_Ocean">
+        SELECT  <include refid="columns"/>  FROM  sea_surface_temperature_anomaly
+        WHERE 1=1
+        <if test="startDate!= null and startDate !=''">
+            AND startDate > #{startDate}
+        </if>
+
+    </select>
+
+    <delete id="DelOcean">
+        DELETE FROM sea_surface_temperature_anomaly
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoOcean">
+        <![CDATA[
+        INSERT INTO sea_surface_temperature_anomaly (
+            id ,
+            nino_phenomenon ,
+            la_nina ,
+            start_date ,
+            end_date ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{ninoPhenomenon,jdbcType=INTEGER},
+                     #{laNina,jdbcType=INTEGER},
+                     #{startDate,jdbcType=DATE},
+                     #{endDate,jdbcType=DATE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
@ -2,8 +2,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.RegionVGIMapper">
-    <resultMap id="RM_RegionVGI" type="com.ruoyi.system.vo.RegionVGIVO">
+<mapper namespace="com.ruoyi.system.mapper_yada.RegionVGIMapper">
+    <resultMap id="RM_RegionVGI" type="com.ruoyi.system.domain_yada.RegionVGIVO">

        <result property="region" column="region"/>
        <result property="id" column="ID"/>
@ -25,7 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>

    <select id="selectRegion" resultMap="RM_RegionVGI">
-        SELECT  <include refid="columns"/>  FROM  region_vgi;
+        SELECT  <include refid="columns"/>  FROM  region_vgi
+        where particular_year='2020.0'
+
+<!--        WHERE 1=1-->
+<!--        <if test="particularYear!= null and particularYear !=''">-->
+<!--            AND particular_year = #{particularYear}-->
+<!--        </if>-->
+<!--        <if test="typeName!= null and typeName !=''">-->
+<!--            AND type_name = #{typeName}-->
+<!--        </if>-->
    </select>

    <delete id="DelRegion">
@ -50,9 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        ) VALUES (
                     #{id,jdbcType=VARCHAR},
                     #{region,jdbcType=VARCHAR},
-                     #{region_en,jdbcType=VARCHAR},
-                     #{type_name,jdbcType=VARCHAR},
-                     #{type_name_en,jdbcType=TIMESTAMP},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{typeName,jdbcType=VARCHAR},
+                     #{typeNameEn,jdbcType=TIMESTAMP},
                     #{forest,jdbcType=DOUBLE},
                     #{createdBy,jdbcType=VARCHAR},
                     #{createdTime,jdbcType=DATE},
--- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
@ -0,0 +1,62 @@
+<?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.RegionalSystemMapper">
+
+    <resultMap id="RM_Regional" type="com.ruoyi.system.domain_yada.RegionalSystemVO">
+
+        <result property="id" column="id"/>
+        <result property="region" column="region"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="typeConversion" column="type_conversion"/>
+        <result property="typeconversionEn" column="type_conversion_en"/>
+        <result property="proportionOfChangedAreas" column="proportion_of_changed_areas"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,region,region_en,type_conversion,type_conversion_en,proportion_of_changed_areas,particular_year,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectRegional" resultMap="RM_Regional">
+        SELECT  <include refid="columns"/>  FROM  proportion_of_ecosystem_type_transfer
+        WHERE 1=1
+        <if test="region!= null and region !=''">
+            AND region = #{region}
+        </if>
+    </select>
+
+    <delete id="DelRegional">
+        DELETE FROM proportion_of_ecosystem_type_transfer
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoRegional">
+        <![CDATA[
+        INSERT INTO proportion_of_ecosystem_type_transfer (
+            region ,
+            region_en ,
+            type_conversion ,
+            type_conversion_en ,
+            proportion_of_changed_areas,
+            particular_year,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{typeConversion,jdbcType=VARCHAR},
+                     #{typeconversionEn,jdbcType=VARCHAR},
+                     #{proportionOfChangedAreas,jdbcType=DOUBLE},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configType != null and configType != ''">#{configType},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
+        current_timestamp
 		)
    </insert>
 	 
@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="configType != null and configType != ''">config_type = #{configType},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
        </set>
        where config_id = #{configId}
    </update>
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="email != null and email != ''">#{email},</if>
 			<if test="status != null">#{status},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+		current_timestamp
 		)
 	</insert>
 	
@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="email != null">email = #{email},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
 		</set>
 		where dept_id = #{deptId}
 	</update>
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
 		</set>
 		where dict_code = #{dictCode}
 	</update>
@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+		current_timestamp
 		)
 	</insert>
 	
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
 		</set>
 		where dict_id = #{dictId}
 	</update>
@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			current_timestamp
 		)
 	</insert>
 	
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

 	<insert id="insertLogininfor" parameterType="SysLogininfor">
 		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
+		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, current_timestamp)
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@ -28,7 +28,7 @@
 	</resultMap>

 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, nullif(perms,'') as perms, icon, create_time
 		from sys_menu
    </sql>
    
@ -49,13 +49,13 @@
 	</select>
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, nullif(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, nullif (m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
 		left join sys_user_role ur on rm.role_id = ur.role_id
@ -74,7 +74,7 @@
 	</select>
    
    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, nullif(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
@ -143,7 +143,7 @@
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			update_time = sysdate()
+			update_time = current_timestamp
 		</set>
 		where menu_id = #{menuId}
 	</update>
@ -184,7 +184,7 @@
 		<if test="icon != null and icon != ''">#{icon},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
-		sysdate()
+		current_timestamp
 		)
 	</insert>
 	
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">#{status}, </if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			current_timestamp
 		)
    </insert>
 	 
@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
            <if test="status != null and status != ''">status = #{status}, </if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
        </set>
        where notice_id = #{noticeId}
    </update>
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    
 	<insert id="insertOperlog" parameterType="SysOperLog">
 		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, current_timestamp)
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
 		</set>
 		where post_id = #{postId}
 	</update>
@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			current_timestamp
 		)
 	</insert>
 	
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
+ 			current_timestamp
 		)
 	</insert>
 	
@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
 		</set>
 		where role_id = #{roleId}
 	</update>
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
+		current_timestamp
 		)
 	</insert>
 	
@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="loginDate != null">login_date = #{loginDate},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
+ 			update_time = current_timestamp
 		</set>
 		where user_id = #{userId}
 	</update>
--- a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
@ -0,0 +1,81 @@
+<?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.ThematicMapMapper">
+    <resultMap id="RM_ThematicMap" type="com.ruoyi.system.domain_yada.ThematicMapDomain">
+        <result property="id" column="id"/>
+        <result property="pictureZh" column="picture_zh"/>
+        <result property="pictureCode" column="picture_code"/>
+        <result property="pictureTypeOne" column="picture_type_one"/>
+        <result property="pictureTypeTwo" column="picture_type_two"/>
+        <result property="pictureEn" column="picture_en"/>
+        <result property="pictureName" column="picture_name"/>
+        <result property="pictureType" column="picture_type"/>
+        <result property="pictureTime" column="picture_time"/>
+        <result property="picturePath" column="picture_path"/>
+        <result property="remarks" column="remarks"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,picture_zh,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>
+
+    <select id="selectAllThematicMap" resultMap="RM_ThematicMap">
+        SELECT  <include refid="columns"/>  FROM thematic_map
+        WHERE 1=1
+        <if test="pictureType!= null and pictureType !=''">
+            AND picture_type = #{pictureType}
+        </if>
+        <if test="pictureTypeOne!= null and pictureTypeOne !=''">
+            AND picture_type_one = #{pictureTypeOne}
+        </if>
+        <if test="pictureTypeTwo!= null and pictureTypeTwo !=''">
+            AND picture_type_two = #{pictureTypeTwo}
+        </if>
+    </select>
+
+    <delete id="deleteThematicMap">
+        DELETE FROM thematic_map
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="saveThematicMap">
+        <![CDATA[
+        INSERT INTO thematic_map (
+            id ,
+            picture_zh ,
+            picture_en ,
+            picture_name ,
+            picture_type ,
+            picture_type_one,
+            picture_type_two,
+            picture_code,
+            picture_time ,
+            picture_path,
+            remarks,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=BIGINT},
+                     #{pictureZh,jdbcType=VARCHAR}},
+                     #{pictureEn,jdbcType=VARCHAR}},
+                     #{pictureName,jdbcType=VARCHAR}},
+                     #{pictureType,jdbcType=VARCHAR}},
+                     #{pictureTypeOne,jdbcType=VARCHAR}},
+                     #{pictureTypeTwo,jdbcType=VARCHAR}},
+                     #{pictureCode,jdbcType=VARCHAR}},
+                     #{pictureTime,jdbcType=TIMESTAMP},
+                     #{picturePath,jdbcType=VARCHAR},
+                     #{remarks,jdbcType=VARCHAR},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml
@ -2,7 +2,61 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.UrbanMapper">
+<mapper namespace="com.ruoyi.system.mapper_yada.UrbanMapper">

+    <resultMap id="RM_Urban" type="com.ruoyi.system.domain_yada.UrbanVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="name" column="name"/>
+        <result property="nameEn" column="name_en"/>
+        <result property="urbanArea" column="urban_area"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,name,name_en,urban_area,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectUrban" resultMap="RM_Urban">
+        SELECT  <include refid="columns"/>  FROM  urban_agglomeration_china
+        WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+        <if test="name!= null and name !=''">
+            AND name = #{name}
+        </if>
+    </select>
+
+    <delete id="DelUrban">
+        DELETE FROM urban_agglomeration_china
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoUrban">
+        <![CDATA[
+        INSERT INTO urban_agglomeration_china (
+            id ,
+            particular_year ,
+            name ,
+            name_en ,
+            urban_area ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{name,jdbcType=VARCHAR},
+                     #{nameEn,jdbcType=VARCHAR},
+                     #{urbanArea,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>

 </mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
@ -0,0 +1,68 @@
+<?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.VegetationCoverageMapper">
+    <resultMap id="RM_Vegetation" type="com.ruoyi.system.domain_yada.VegetationCoverageVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="region" column="region"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="protectedLands" column="protected_lands"/>
+        <result property="nonProtectedLands" column="non_protected_lands"/>
+        <result property="mountain" column="mountain"/>
+        <result property="nonMountain" column="non_mountain"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,region,region_en,protected_lands,non_protected_lands,mountain,non_mountain,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectVegetation" resultMap="RM_Vegetation">
+        SELECT  <include refid="columns"/>  FROM  fvc_npp
+<!--        WHERE 1=1-->
+<!--        <if test="particularYear!= null and particularYear !=''">-->
+<!--            AND particular_year = #{particularYear}-->
+<!--        </if>-->
+<!--        <if test="region != null and region !=''">-->
+<!--            AND region = #{region}-->
+<!--        </if>-->
+    </select>
+
+    <delete id="DelVegetation">
+        DELETE FROM fvc_npp
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoVegetation">
+        <![CDATA[
+        INSERT INTO fvc_npp (
+            particular_year ,
+            region ,
+            region_en ,
+            protected_lands ,
+            non_protected_lands ,
+            mountain,
+            non_mountain,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{protectedLands,jdbcType=DOUBLE},
+                     #{nonProtectedLands,jdbcType=DOUBLE},
+                     #{mountain,jdbcType=DOUBLE},
+                     #{nonMountain,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+
+</mapper>