合并更新

Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:1 # ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
2022-05-23 09:49:01 +08:00 · 2022-05-23 09:48:47 +08:00 · 2022-05-23 09:42:20 +08:00
43 changed files with 964 additions and 245 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@ -1,6 +1,5 @@
 package com.ruoyi;

-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 * 
 * @author ruoyi
 */
-@MapperScan("com.ruoyi.system.mapper_yada")
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java
@ -1,7 +1,9 @@
 package com.ruoyi.web.controller.yada;

 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
 import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.service_yada.IAorestCoverageService;
 import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -21,7 +23,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8")
 public class AorestCoverageController {
    //@Autowired
-    private IAustraliaMiddleEastService australiaMiddleEastService;
+    private IAorestCoverageService service;

    /**
     * 查询方法
@ -29,10 +31,10 @@ public class AorestCoverageController {
     * @param request
     * @return
     */
-    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST})
+    public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request)
    {
-        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage();
        return AjaxResult.success(eastVOSList);
    }

@ -41,10 +43,10 @@ public class AorestCoverageController {
     * @param ID
     * @return
     */
-    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAustralia(@Param("ID") String ID)
+    @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST})
+    public AjaxResult DelAorestCoverage(@Param("ID") String ID)
    {
-        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        int NUM = service.DelAorestCoverage(ID);
        if (NUM>0)
        {
            return AjaxResult.success();
@ -58,10 +60,10 @@ public class AorestCoverageController {
     * @param eastVOS
     * @return
     */
-    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST})
+    public AjaxResult IntoAorestCoverage(AorestCoverageVO eastVOS)
    {
-        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        int NUM =  service.IntoAorestCoverage(eastVOS);
        if (NUM>0)
        {
            return AjaxResult.success();
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java
@ -2,7 +2,9 @@ package com.ruoyi.web.controller.yada;

 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
 import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IGlobalTypeService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -21,7 +23,7 @@ import java.util.List;
@RequestMapping("/monitor/clobal")
 public class GlobalTypeController {
    //@Autowired
-    private IAustraliaMiddleEastService australiaMiddleEastService;
+    private IGlobalTypeService typeService;

    /**
     * 查询方法
@ -29,10 +31,10 @@ public class GlobalTypeController {
     * @param request
     * @return
     */
-    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST})
+    public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request)
    {
-        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType();
        return AjaxResult.success(eastVOSList);
    }

@ -41,10 +43,10 @@ public class GlobalTypeController {
     * @param ID
     * @return
     */
-    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAustralia(@Param("ID") String ID)
+    @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST})
+    public AjaxResult DelGlobalType(@Param("ID") String ID)
    {
-        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        int NUM = typeService.DelGlobalType(ID);
        if (NUM>0)
        {
            return AjaxResult.success();
@ -58,10 +60,10 @@ public class GlobalTypeController {
     * @param eastVOS
     * @return
     */
-    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST})
+    public AjaxResult IntoGlobalType(GlobalTypeVO eastVOS)
    {
-        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        int NUM =  typeService.IntoGlobalType(eastVOS);
        if (NUM>0)
        {
            return AjaxResult.success();
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java
@ -2,7 +2,9 @@ package com.ruoyi.web.controller.yada;

 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
 import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IOceanTemperatureService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -21,7 +23,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8")
 public class OceanTemperatureController {
    //@Autowired
-    private IAustraliaMiddleEastService australiaMiddleEastService;
+    private IOceanTemperatureService temperatureService;

    /**
     * 查询方法
@ -29,10 +31,10 @@ public class OceanTemperatureController {
     * @param request
     * @return
     */
-    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    @RequestMapping(value = "/selectOcean",method = {RequestMethod.POST})
+    public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request)
    {
-        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<OceanTemperatureVO> eastVOSList= temperatureService.selectOcean();
        return AjaxResult.success(eastVOSList);
    }

@ -41,10 +43,10 @@ public class OceanTemperatureController {
     * @param ID
     * @return
     */
-    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAustralia(@Param("ID") String ID)
+    @RequestMapping(value = "/DelOcean",method = {RequestMethod.POST})
+    public AjaxResult DelOcean(@Param("ID") String ID)
    {
-        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        int NUM = temperatureService.DelOcean(ID);
        if (NUM>0)
        {
            return AjaxResult.success();
@ -59,9 +61,9 @@ public class OceanTemperatureController {
     * @return
     */
    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    public AjaxResult IntoOcean(OceanTemperatureVO eastVOS)
    {
-        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        int NUM =  temperatureService.IntoOcean(eastVOS);
        if (NUM>0)
        {
            return AjaxResult.success();
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java
@ -2,7 +2,10 @@ package com.ruoyi.web.controller.yada;

 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
 import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IRegionalSystemService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -21,7 +24,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8")
 public class RegionalSystemController {
    //@Autowired
-    private IAustraliaMiddleEastService australiaMiddleEastService;
+    private IRegionalSystemService systemService;

    /**
     * 查询方法
@ -29,10 +32,10 @@ public class RegionalSystemController {
     * @param request
     * @return
     */
-    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    @RequestMapping(value = "/selectRegional",method = {RequestMethod.POST})
+    public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request)
    {
-        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<RegionalSystemVO> eastVOSList= systemService.selectRegional();
        return AjaxResult.success(eastVOSList);
    }

@ -41,10 +44,10 @@ public class RegionalSystemController {
     * @param ID
     * @return
     */
-    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAustralia(@Param("ID") String ID)
+    @RequestMapping(value = "/DelRegional",method = {RequestMethod.POST})
+    public AjaxResult DelRegional(@Param("ID") String ID)
    {
-        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        int NUM = systemService.DelRegional(ID);
        if (NUM>0)
        {
            return AjaxResult.success();
@ -58,10 +61,10 @@ public class RegionalSystemController {
     * @param eastVOS
     * @return
     */
-    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST})
+    public AjaxResult IntoRegional(RegionalSystemVO eastVOS)
    {
-        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        int NUM =  systemService.IntoRegional(eastVOS);
        if (NUM>0)
        {
            return AjaxResult.success();
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java
@ -2,7 +2,9 @@ package com.ruoyi.web.controller.yada;

 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.UrbanVO;
 import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IUrbanService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -21,7 +23,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8")
 public class UrbanController {
    //@Autowired
-    private IAustraliaMiddleEastService australiaMiddleEastService;
+    private IUrbanService urbanService;

    /**
     * 查询方法
@ -29,10 +31,10 @@ public class UrbanController {
     * @param request
     * @return
     */
-    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    @RequestMapping(value = "/selectUrban",method = {RequestMethod.POST})
+    public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request)
    {
-        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<UrbanVO> eastVOSList= urbanService.selectUrban();
        return AjaxResult.success(eastVOSList);
    }

@ -41,10 +43,10 @@ public class UrbanController {
     * @param ID
     * @return
     */
-    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAustralia(@Param("ID") String ID)
+    @RequestMapping(value = "/DelUrban",method = {RequestMethod.POST})
+    public AjaxResult DelUrban(@Param("ID") String ID)
    {
-        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        int NUM = urbanService.DelUrban(ID);
        if (NUM>0)
        {
            return AjaxResult.success();
@ -58,10 +60,10 @@ public class UrbanController {
     * @param eastVOS
     * @return
     */
-    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST})
+    public AjaxResult IntoUrban(UrbanVO eastVOS)
    {
-        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        int NUM =  urbanService.IntoUrban(eastVOS);
        if (NUM>0)
        {
            return AjaxResult.success();
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java
@ -2,7 +2,9 @@ package com.ruoyi.web.controller.yada;

 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
 import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IVegetationCoverageService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -21,7 +23,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8")
 public class VegetationCoverageController {
    //@Autowired
-    private IAustraliaMiddleEastService australiaMiddleEastService;
+    private IVegetationCoverageService coverageService;

    /**
     * 查询方法
@ -29,10 +31,10 @@ public class VegetationCoverageController {
     * @param request
     * @return
     */
-    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    @RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST})
+    public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request)
    {
-        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
        return AjaxResult.success(eastVOSList);
    }

@ -41,10 +43,10 @@ public class VegetationCoverageController {
     * @param ID
     * @return
     */
-    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAustralia(@Param("ID") String ID)
+    @RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST})
+    public AjaxResult DelVegetation(@Param("ID") String ID)
    {
-        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        int NUM = coverageService.DelVegetation(ID);
        if (NUM>0)
        {
            return AjaxResult.success();
@ -58,10 +60,10 @@ public class VegetationCoverageController {
     * @param eastVOS
     * @return
     */
-    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST})
+    public AjaxResult IntoVegetation(VegetationCoverageVO eastVOS)
    {
-        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        int NUM =  coverageService.IntoVegetation(eastVOS);
        if (NUM>0)
        {
            return AjaxResult.success();
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
  # 服务器的HTTP端口，默认为8080
-  port: 9900
+  port: 8080
  servlet:
    # 应用的访问路径
    context-path: /
@ -97,9 +97,9 @@ token:
 # MyBatis配置
 mybatis:
    # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
+    typeAliasesPackage: com.ruoyi.**.domain
    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
    # 加载全局的配置文件
    configLocation: classpath:mybatis/mybatis-config.xml

@ -116,7 +116,6 @@ swagger:
  # 请求前缀
  pathMapping: /dev-api

-
 # 防止XSS攻击
 xss:
  # 过滤开关
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ b/ruoyi-admin/src/main/resources/banner.txt
@ -1,34 +1,24 @@
 Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
-                          /\
-                         |  |
-                         |  |
-                        .'  '.
-                        |    |
-                        |    |
-                        | /\ |
-                      .' |__|'.
-                      |  |  |  |
-                     .'  |  |  '.
-                /\   |   \__/   |   /\
-               |  |  |   |  |   |  |  |
-           /|  |  |,-\   |  |   /-,|  |  |\
-           ||  |,-'   |  |  |  |   '-,|  ||
-           ||-'       |  |  |  |       '-||
-|\     _,-'           |  |  |  |           '-,_     /|
-||  ,-'   _           |  |  |  |               '-,  ||
-||-'    =(*)=         |  |  |  |                  '-||
-||                    |  \  /  |                    ||
-|\________....--------\   ||   /--------....________/|
-                      /|  ||  |\
-                     / |  ||  | \
-                    /  |  \/  |  \
-                   /   |      |   \
-                 //   .|      |.   \\
-               .' |_./ |      | \._| '.
-              /     _.-|||  |||-._     \
-              \__.-'   \||/\||/   '-.__/
+//                          _ooOoo_                               //
+//                         o6666666o                              //
+//                         88" . "88                              //
+//                         (| ^_^ |)                              //
+//                         O\  =  /O                              //
+//                      ____/`---'\____                           //
+//                    .'  \\|     |//  `.                         //
+//                   /  \\|||  :  |||//  \                        //
+//                  /  _||||| -:- |||||-  \                       //
+//                  |   | \\\  -  /// |   |                       //
+//                  | \_|  ''\---/''  |   |                       //
+//                  \  .-\__  `-`  ___/-. /                       //
+//                ___`. .'  /--.--\  `. . ___                     //
+//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+//      ========`-.____`-.___\_____/___.-`____.-'========         //
+//                           `=---='                              //
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             飞机保佑       永不宕机      永无BUG               //
+//             佛祖保佑       永不宕机      永无BUG               //
 ////////////////////////////////////////////////////////////////////
--- 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
@ -15,13 +15,13 @@ public class AorestCoverageVO extends  SysBaseEntity {

    private  String regionEn;

-    private  String protectedLands;
+    private  Double protectedLands;

-    private  String nonProtectedLands;
+    private  Double nonProtectedLands;

-    private  String mountain;
+    private  Double mountain;

-    private  String nonMountain;
+    private  Double nonMountain;

    public String getId() {
        return id;
@ -55,35 +55,35 @@ public class AorestCoverageVO extends  SysBaseEntity {
        this.regionEn = regionEn;
    }

-    public String getProtectedLands() {
+    public Double getProtectedLands() {
        return protectedLands;
    }

-    public void setProtectedLands(String protectedLands) {
+    public void setProtectedLands(Double protectedLands) {
        this.protectedLands = protectedLands;
    }

-    public String getNonProtectedLands() {
+    public Double getNonProtectedLands() {
        return nonProtectedLands;
    }

-    public void setNonProtectedLands(String nonProtectedLands) {
+    public void setNonProtectedLands(Double nonProtectedLands) {
        this.nonProtectedLands = nonProtectedLands;
    }

-    public String getMountain() {
+    public Double getMountain() {
        return mountain;
    }

-    public void setMountain(String mountain) {
+    public void setMountain(Double mountain) {
        this.mountain = mountain;
    }

-    public String getNonMountain() {
+    public Double getNonMountain() {
        return nonMountain;
    }

-    public void setNonMountain(String 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
@ -6,7 +6,7 @@ import java.time.LocalDate;
 * @Author: JinSheng Song
 * @Date: 2022/5/19 14:50
 */
-public class AustraliaMiddleEastVO
+public class AustraliaMiddleEastVO extends SysBaseEntity
 {
    private  String id;

@ -22,8 +22,15 @@ public class AustraliaMiddleEastVO

    private  String createdBy;

-    private  String createdTime;
+    private  LocalDate createdTime;

+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }

    public LocalDate getYearMonth() {
        return yearMonth;
@ -73,19 +80,11 @@ public class AustraliaMiddleEastVO
        this.createdBy = createdBy;
    }

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

-    public void setCreatedTime(String createdTime) {
+    public void setCreatedTime(LocalDate createdTime) {
        this.createdTime = createdTime;
    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 }
--- 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
@ -5,5 +5,65 @@ package com.ruoyi.system.domain_yada;
 * @Author: JinSheng Song
 * @Date: 2022/5/20 14:07
 */
-public class GlobalTypeVO {
+public class GlobalTypeVO extends  SysBaseEntity {
+
+    private  String id;
+
+    private  String typeName;
+
+    private  String  typeNameEn;
+
+    private  Double areaProportion;
+
+    private  String 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 String getArea() {
+        return area;
+    }
+
+    public void setArea(String 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/OceanTemperatureVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java
@ -1,9 +1,62 @@
 package com.ruoyi.system.domain_yada;

+import java.time.LocalDate;
+
 /**+
 * 海面温度监测
 * @Author: JinSheng Song
 * @Date: 2022/5/20 14:08
 */
-public class OceanTemperatureVO {
+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/RegionalSystemVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java
@ -6,5 +6,75 @@ package com.ruoyi.system.domain_yada;
 * @Date: 2022/5/20 14:09
 */

-public class RegionalSystemVO {
+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
@ -15,61 +15,67 @@ public class SysBaseEntity implements Serializable
    private static final long serialVersionUID = 1L;

    /** 创建者 */
-    private String createdBy;
+    private String createBy;

    /** 创建时间 */
-    private LocalDateTime createdTime;
+    private LocalDateTime createTime;

    /** 更新者 */
-    private String updatedBy;
+    private String updateBy;

    /** 更新时间 */
-    private LocalDateTime updatedTime;
+    private LocalDateTime updateTime;

    /** 备注 */
-    private String remarks;
+    private String remark;

    /** 请求参数 */
    private Map<String, Object> params;

-    public String getCreatedBy() {
-        return createdBy;
+    public String getCreateBy()
+    {
+        return createBy;
    }

-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
    }

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

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

-    public String getUpdatedBy() {
-        return updatedBy;
+    public String getUpdateBy()
+    {
+        return updateBy;
    }

-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
    }

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

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

-    public String getRemarks() {
-        return remarks;
+    public String getRemark()
+    {
+        return remark;
    }

-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
    }

    public Map<String, Object> getParams()
--- 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
@ -1,13 +1,91 @@
 package com.ruoyi.system.domain_yada;

-import java.time.LocalDateTime;
+import java.time.LocalDate;

 /**
 * 平均植被覆盖度和净初级生产力
 * @Author: JinSheng Song
 * @Date: 2022/5/20 14:09
 */
-public class VegetationCoverageVO extends SysBaseEntity {
+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/mapper_yada/AorestCoverageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
@ -1,14 +1,19 @@
 package com.ruoyi.system.mapper_yada;

+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
 * @Author: JinSheng Song
 * @Date: 2022/5/11 15:17
 */
 public interface AorestCoverageMapper {

-//    List<AustraliaMiddleEastVO> selectAustralia();
-//
-//    Integer DelAustralia(@Param("id") String id);
-//
-//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    List<AorestCoverageVO> selectAorestCoverage();
+
+    Integer DelAorestCoverage(@Param("id") String id);
+
+    Integer IntoAorestCoverage(AorestCoverageVO eastVO);
 }
--- 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
@ -1,14 +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<AustraliaMiddleEastVO> selectAustralia();
-//
-//    Integer DelAustralia(@Param("id") String id);
-//
-//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    List<GlobalTypeVO> selectGlobalType();
+
+    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
@ -1,14 +1,20 @@
 package com.ruoyi.system.mapper_yada;

+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
 * @Author: JinSheng Song
 * @Date: 2022/5/11 15:18
 */
 public interface OceanTemperatureMapper {

-//    List<AustraliaMiddleEastVO> selectAustralia();
-//
-//    Integer DelAustralia(@Param("id") String id);
-//
-//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    List<OceanTemperatureVO> selectOcean();
+
+    Integer DelOcean(@Param("id") String id);
+
+    Integer IntoOcean(OceanTemperatureVO eastVO);
+
 }
--- 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
@ -1,14 +1,19 @@
 package com.ruoyi.system.mapper_yada;

+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
 * @Author: JinSheng Song
 * @Date: 2022/5/11 15:18
 */
 public interface RegionalSystemMapper {

-//    List<AustraliaMiddleEastVO> selectAustralia();
-//
-//    Integer DelAustralia(@Param("id") String id);
-//
-//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    List<RegionalSystemVO> selectRegional();
+
+    Integer DelRegional(@Param("id") String id);
+
+    Integer IntoRegional(RegionalSystemVO eastVO);
 }
--- 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
@ -1,8 +1,20 @@
 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();
+
+    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
@ -1,14 +1,19 @@
 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<AustraliaMiddleEastVO> selectAustralia();
-//
-//    Integer DelAustralia(@Param("id") String id);
-//
-//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    List<VegetationCoverageVO> selectVegetation();
+
+    Integer DelVegetation(@Param("id") String id);
+
+    Integer IntoVegetation(VegetationCoverageVO eastVO);
 }
--- 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
@ -1,5 +1,6 @@
 package com.ruoyi.system.service_yada;

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

@ -12,9 +13,9 @@ import java.util.List;
 */
 public interface IAorestCoverageService {

-    public List<AustraliaMiddleEastVO> selectAustralia();
+    public List<AorestCoverageVO> selectAorestCoverage();

-    public Integer DelAustralia(@Param("id") String id);
+    public Integer DelAorestCoverage(@Param("id") String id);

-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    public Integer IntoAorestCoverage(AorestCoverageVO eastVO);
 }
--- 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
@ -1,6 +1,7 @@
 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;
@ -12,9 +13,9 @@ import java.util.List;
 */
 public interface IGlobalTypeService {

-    public List<AustraliaMiddleEastVO> selectAustralia();
+   public List<GlobalTypeVO> selectGlobalType();

-    public Integer DelAustralia(@Param("id") String id);
+   public   Integer DelGlobalType(String id);

-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+   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
@ -1,6 +1,7 @@
 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.util.List;
@ -12,9 +13,9 @@ import java.util.List;
 */
 public interface IOceanTemperatureService {

-    public List<AustraliaMiddleEastVO> selectAustralia();
+    public List<OceanTemperatureVO> selectOcean();

-    public Integer DelAustralia(@Param("id") String id);
+    public Integer DelOcean(@Param("id") String id);

-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    public Integer IntoOcean(OceanTemperatureVO 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
@ -1,6 +1,7 @@
 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;
@ -12,9 +13,9 @@ import java.util.List;
 */
 public interface IRegionalSystemService {

-    public List<AustraliaMiddleEastVO> selectAustralia();
+    public List<RegionalSystemVO> selectRegional();

-    public Integer DelAustralia(@Param("id") String id);
+    public Integer DelRegional(@Param("id") String id);

-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    public Integer IntoRegional(RegionalSystemVO eastVO);
 }
--- 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
@ -1,9 +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();
+
+    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
@ -1,6 +1,7 @@
 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;
@ -12,9 +13,9 @@ import java.util.List;
 */
 public interface IVegetationCoverageService {

-    public List<AustraliaMiddleEastVO> selectAustralia();
+    public List<VegetationCoverageVO> selectVegetation();

-    public Integer DelAustralia(@Param("id") String id);
+    public Integer DelVegetation(String id);

-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+    public Integer IntoVegetation(VegetationCoverageVO eastVO);
 }
--- 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
@ -1,6 +1,8 @@
 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.mapper_yada.AorestCoverageMapper;
 import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
 import com.ruoyi.system.service_yada.IAorestCoverageService;
 import org.springframework.beans.factory.annotation.Autowired;
@ -14,22 +16,21 @@ import java.util.List;
 */
 public class AorestCoverageServiceimpl implements IAorestCoverageService {
    @Autowired
-    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+    private AorestCoverageMapper coverageMapper;
+

    @Override
-    public List<AustraliaMiddleEastVO> selectAustralia()
-    {
-        return australiaMiddleEastMapper.selectAustralia();
+    public List<AorestCoverageVO> selectAorestCoverage() {
+        return coverageMapper.selectAorestCoverage();
    }

    @Override
-    public Integer DelAustralia(String id) {
-        return australiaMiddleEastMapper.DelAustralia(id);
-
+    public Integer DelAorestCoverage(String id) {
+        return coverageMapper.DelAorestCoverage(id);
    }

    @Override
-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    public Integer IntoAorestCoverage(AorestCoverageVO eastVO) {
+        return IntoAorestCoverage(eastVO);
    }
 }
--- 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
@ -1,7 +1,9 @@
 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.springframework.beans.factory.annotation.Autowired;

@ -15,22 +17,21 @@ import java.util.List;
 public class GlobalTypeServiceimpl implements IGlobalTypeService {

    @Autowired
-    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+    private GlobalTypeMapper typeMapper;
+

    @Override
-    public List<AustraliaMiddleEastVO> selectAustralia()
-    {
-        return australiaMiddleEastMapper.selectAustralia();
+    public List<GlobalTypeVO> selectGlobalType() {
+        return typeMapper.selectGlobalType();
    }

    @Override
-    public Integer DelAustralia(String id) {
-        return australiaMiddleEastMapper.DelAustralia(id);
-
+    public Integer DelGlobalType(String id) {
+        return typeMapper.DelGlobalType(id);
    }

    @Override
-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    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
@ -1,7 +1,9 @@
 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;

@ -15,22 +17,21 @@ import java.util.List;
 public class OceanTemperatureServiceimpl implements IOceanTemperatureService {

    @Autowired
-    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+    private OceanTemperatureMapper oceanMapper;
+

    @Override
-    public List<AustraliaMiddleEastVO> selectAustralia()
-    {
-        return australiaMiddleEastMapper.selectAustralia();
+    public List<OceanTemperatureVO> selectOcean() {
+        return oceanMapper.selectOcean();
    }

    @Override
-    public Integer DelAustralia(String id) {
-        return australiaMiddleEastMapper.DelAustralia(id);
-
+    public Integer DelOcean(String id) {
+        return oceanMapper.DelOcean(id);
    }

    @Override
-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    public Integer IntoOcean(OceanTemperatureVO eastVO) {
+        return oceanMapper.IntoOcean(eastVO);
    }
 }
--- 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
@ -1,7 +1,9 @@
 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.springframework.beans.factory.annotation.Autowired;

@ -15,22 +17,22 @@ import java.util.List;
 public class RegionalSystemServiceimpl implements IRegionalSystemService {

    @Autowired
-    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+    private RegionalSystemMapper Regional;
+

    @Override
-    public List<AustraliaMiddleEastVO> selectAustralia()
-    {
-        return australiaMiddleEastMapper.selectAustralia();
+    public List<RegionalSystemVO> selectRegional() {
+        return Regional.selectRegional();
    }

    @Override
-    public Integer DelAustralia(String id) {
-        return australiaMiddleEastMapper.DelAustralia(id);
-
+    public Integer DelRegional(String id) {
+        return Regional.DelRegional(id);
    }

    @Override
-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    public Integer IntoRegional(RegionalSystemVO eastVO) {
+        return Regional.IntoRegional(eastVO);
    }
+
 }
--- 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
@ -1,6 +1,12 @@
 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.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;

 /**
 * * 城市监测
@ -8,4 +14,23 @@ import com.ruoyi.system.service_yada.IUrbanService;
 * @Date: 2022/5/11 11:49
 */
 public class UrbanServiceimpl implements IUrbanService {
+
+    @Autowired
+    private UrbanMapper urbanMapper;
+
+    @Override
+
+    public List<UrbanVO> selectUrban() {
+        return urbanMapper.selectUrban();
+    }
+
+    @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
@ -1,7 +1,9 @@
 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.springframework.beans.factory.annotation.Autowired;

@ -16,22 +18,21 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService


    @Autowired
-    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+    private VegetationCoverageMapper coverageMapper;
+

    @Override
-    public List<AustraliaMiddleEastVO> selectAustralia()
-    {
-        return australiaMiddleEastMapper.selectAustralia();
+    public List<VegetationCoverageVO> selectVegetation() {
+        return coverageMapper.selectVegetation();
    }

    @Override
-    public Integer DelAustralia(String id) {
-        return australiaMiddleEastMapper.DelAustralia(id);
-
+    public Integer DelVegetation(String id) {
+        return coverageMapper.DelVegetation(id);
    }

    @Override
-    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    public Integer IntoVegetation(VegetationCoverageVO eastVO) {
+        return coverageMapper.IntoVegetation(eastVO);
    }
 }
--- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
@ -4,5 +4,61 @@ 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;
+    </select>
+
+    <delete id="DelAorestCoverage">
+        DELETE FROM forest_coverage
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoAorestCoverage">
+        <![CDATA[
+        INSERT INTO forest_coverage (
+            id ,
+            particular_year ,
+            region ,
+            region_en ,
+            protected_lands ,
+            non_protected_lands ,
+            mountain,
+            non_mountain,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{protectedLands,jdbcType=DOUBLE},
+                     #{nonProtectedLand,jdbcType=DOUBLE},
+                     #{mountain,jdbcType=DOUBLE},
+                     #{nonMountain,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>

 </mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml
@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{precipitationAnomolies,jdbcType=DOUBLE},
                     #{vaiAnomolies,jdbcType=DOUBLE},
                     #{createdBy,jdbcType=VARCHAR},
-                     #{createdTime,jdbcType=VARCHAR}
+                     #{createdTime,jdbcType=DATE}
                 )
        ]]>
    </insert>
--- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
@ -4,4 +4,54 @@ 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;
+    </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
@ -4,5 +4,52 @@ 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
+    </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/RegionalSystemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
@ -4,5 +4,57 @@ 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,createBy,createTime
+        ]]>
+	</sql>
+
+    <select id="selectRegional" resultMap="RM_Regional">
+        SELECT  <include refid="columns"/>  FROM  proportion_of_ecosystem_type_transfer
+    </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 (
+            id ,
+            region ,
+            region_en ,
+            type_conversion ,
+            type_conversion_en ,
+            proportion_of_changed_areas,
+            particular_year,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{typeConversion,jdbcType=VARCHAR},
+                     #{typeconversionEn,jdbcType=VARCHAR},
+                     #{proportionOfChangedAreas,jdbcType=DOUBLE},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
 </mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml
@ -4,5 +4,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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
+    </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
@ -3,6 +3,61 @@
 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
+    </select>
+
+    <delete id="DelVegetation">
+        DELETE FROM fvc_npp
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoVegetation">
+        <![CDATA[
+        INSERT INTO fvc_npp (
+            id ,
+            particular_year ,
+            region ,
+            region_en ,
+            protected_lands ,
+            non_protected_lands ,
+            mountain,
+            non_mountain,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{protectedLands,jdbcType=DOUBLE},
+                     #{nonProtectedLand,jdbcType=DOUBLE},
+                     #{mountain,jdbcType=DOUBLE},
+                     #{nonMountain,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>

 </mapper> 
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@ -1,11 +1,11 @@
-# 页面标题
-VUE_APP_TITLE = 若依管理系统
-
-# 开发环境配置
-ENV = 'development'
-
-# 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.2.105:9900'
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
+# 页面标题
+VUE_APP_TITLE = 若依管理系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 若依管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
Author	SHA1	Message	Date
songjinsheng	f4caf10bd3	合并更新	2022-05-23 09:49:01 +08:00
songjinsheng	bb6fb94038	Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev # Conflicts:1 # ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java	2022-05-23 09:48:47 +08:00
songjinsheng	7cfae514ea	控制器修改	2022-05-23 09:42:20 +08:00