ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,5 +1,6 @@
 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;
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * 
  * @author ruoyi
  */
+@MapperScan("com.ruoyi.system.mapper_yada")
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java

@@ -1,9 +1,7 @@
 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;
@@ -23,7 +21,7 @@ import java.util.List;
 @RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8")
 public class AorestCoverageController {
     //@Autowired
-    private IAorestCoverageService service;
+    private IAustraliaMiddleEastService australiaMiddleEastService;
 
     /**
      * 查询方法
@@ -31,10 +29,10 @@ public class AorestCoverageController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST})
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request)
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
     {
-        List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
         return AjaxResult.success(eastVOSList);
     }
 
@@ -43,10 +41,10 @@ public class AorestCoverageController {
      * @param ID
      * @return
      */
-    @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST})
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelAorestCoverage(@Param("ID") String ID)
+    public AjaxResult DelAustralia(@Param("ID") String ID)
     {
-        int NUM = service.DelAorestCoverage(ID);
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
         if (NUM>0)
         {
             return AjaxResult.success();
@@ -60,10 +58,10 @@ public class AorestCoverageController {
      * @param eastVOS
      * @return
      */
-    @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST})
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoAorestCoverage(AorestCoverageVO eastVOS)
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
     {
-        int NUM =  service.IntoAorestCoverage(eastVOS);
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
         if (NUM>0)
         {
             return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java

@@ -2,9 +2,7 @@ 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;
@@ -23,7 +21,7 @@ import java.util.List;
 @RequestMapping("/monitor/clobal")
 public class GlobalTypeController {
     //@Autowired
-    private IGlobalTypeService typeService;
+    private IAustraliaMiddleEastService australiaMiddleEastService;
 
     /**
      * 查询方法
@@ -31,10 +29,10 @@ public class GlobalTypeController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST})
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request)
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
     {
-        List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
         return AjaxResult.success(eastVOSList);
     }
 
@@ -43,10 +41,10 @@ public class GlobalTypeController {
      * @param ID
      * @return
      */
-    @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST})
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelGlobalType(@Param("ID") String ID)
+    public AjaxResult DelAustralia(@Param("ID") String ID)
     {
-        int NUM = typeService.DelGlobalType(ID);
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
         if (NUM>0)
         {
             return AjaxResult.success();
@@ -60,10 +58,10 @@ public class GlobalTypeController {
      * @param eastVOS
      * @return
      */
-    @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST})
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoGlobalType(GlobalTypeVO eastVOS)
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
     {
-        int NUM =  typeService.IntoGlobalType(eastVOS);
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
         if (NUM>0)
         {
             return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java

@@ -2,9 +2,7 @@ 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;
@@ -23,7 +21,7 @@ import java.util.List;
 @RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8")
 public class OceanTemperatureController {
     //@Autowired
-    private IOceanTemperatureService temperatureService;
+    private IAustraliaMiddleEastService australiaMiddleEastService;
 
     /**
      * 查询方法
@@ -31,10 +29,10 @@ public class OceanTemperatureController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/selectOcean",method = {RequestMethod.POST})
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request)
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
     {
-        List<OceanTemperatureVO> eastVOSList= temperatureService.selectOcean();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
         return AjaxResult.success(eastVOSList);
     }
 
@@ -43,10 +41,10 @@ public class OceanTemperatureController {
      * @param ID
      * @return
      */
-    @RequestMapping(value = "/DelOcean",method = {RequestMethod.POST})
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelOcean(@Param("ID") String ID)
+    public AjaxResult DelAustralia(@Param("ID") String ID)
     {
-        int NUM = temperatureService.DelOcean(ID);
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
         if (NUM>0)
         {
             return AjaxResult.success();
@@ -61,9 +59,9 @@ public class OceanTemperatureController {
      * @return
      */
     @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoOcean(OceanTemperatureVO eastVOS)
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
     {
-        int NUM =  temperatureService.IntoOcean(eastVOS);
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
         if (NUM>0)
         {
             return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java

@@ -2,10 +2,7 @@ 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;
@@ -24,7 +21,7 @@ import java.util.List;
 @RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8")
 public class RegionalSystemController {
     //@Autowired
-    private IRegionalSystemService systemService;
+    private IAustraliaMiddleEastService australiaMiddleEastService;
 
     /**
      * 查询方法
@@ -32,10 +29,10 @@ public class RegionalSystemController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/selectRegional",method = {RequestMethod.POST})
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request)
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
     {
-        List<RegionalSystemVO> eastVOSList= systemService.selectRegional();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
         return AjaxResult.success(eastVOSList);
     }
 
@@ -44,10 +41,10 @@ public class RegionalSystemController {
      * @param ID
      * @return
      */
-    @RequestMapping(value = "/DelRegional",method = {RequestMethod.POST})
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelRegional(@Param("ID") String ID)
+    public AjaxResult DelAustralia(@Param("ID") String ID)
     {
-        int NUM = systemService.DelRegional(ID);
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
         if (NUM>0)
         {
             return AjaxResult.success();
@@ -61,10 +58,10 @@ public class RegionalSystemController {
      * @param eastVOS
      * @return
      */
-    @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST})
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoRegional(RegionalSystemVO eastVOS)
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
     {
-        int NUM =  systemService.IntoRegional(eastVOS);
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
         if (NUM>0)
         {
             return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java

@@ -2,9 +2,7 @@ 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;
@@ -23,7 +21,7 @@ import java.util.List;
 @RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8")
 public class UrbanController {
     //@Autowired
-    private IUrbanService urbanService;
+    private IAustraliaMiddleEastService australiaMiddleEastService;
 
     /**
      * 查询方法
@@ -31,10 +29,10 @@ public class UrbanController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/selectUrban",method = {RequestMethod.POST})
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request)
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
     {
-        List<UrbanVO> eastVOSList= urbanService.selectUrban();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
         return AjaxResult.success(eastVOSList);
     }
 
@@ -43,10 +41,10 @@ public class UrbanController {
      * @param ID
      * @return
      */
-    @RequestMapping(value = "/DelUrban",method = {RequestMethod.POST})
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelUrban(@Param("ID") String ID)
+    public AjaxResult DelAustralia(@Param("ID") String ID)
     {
-        int NUM = urbanService.DelUrban(ID);
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
         if (NUM>0)
         {
             return AjaxResult.success();
@@ -60,10 +58,10 @@ public class UrbanController {
      * @param eastVOS
      * @return
      */
-    @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST})
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoUrban(UrbanVO eastVOS)
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
     {
-        int NUM =  urbanService.IntoUrban(eastVOS);
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
         if (NUM>0)
         {
             return AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java

@@ -2,9 +2,7 @@ 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;
@@ -23,7 +21,7 @@ import java.util.List;
 @RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8")
 public class VegetationCoverageController {
     //@Autowired
-    private IVegetationCoverageService coverageService;
+    private IAustraliaMiddleEastService australiaMiddleEastService;
 
     /**
      * 查询方法
@@ -31,10 +29,10 @@ public class VegetationCoverageController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST})
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
-    public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request)
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
     {
-        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
         return AjaxResult.success(eastVOSList);
     }
 
@@ -43,10 +41,10 @@ public class VegetationCoverageController {
      * @param ID
      * @return
      */
-    @RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST})
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
-    public AjaxResult DelVegetation(@Param("ID") String ID)
+    public AjaxResult DelAustralia(@Param("ID") String ID)
     {
-        int NUM = coverageService.DelVegetation(ID);
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
         if (NUM>0)
         {
             return AjaxResult.success();
@@ -60,10 +58,10 @@ public class VegetationCoverageController {
      * @param eastVOS
      * @return
      */
-    @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST})
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
-    public AjaxResult IntoVegetation(VegetationCoverageVO eastVOS)
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
     {
-        int NUM =  coverageService.IntoVegetation(eastVOS);
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
         if (NUM>0)
         {
             return AjaxResult.success();

ruoyi-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 9900
   servlet:
     # 应用的访问路径
     context-path: /
@@ -97,9 +97,9 @@ token:
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
+    typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
     # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
 
@@ -116,6 +116,7 @@ swagger:
   # 请求前缀
   pathMapping: /dev-api
 
+
 # 防止XSS攻击
 xss:
   # 过滤开关

ruoyi-admin/src/main/resources/banner.txt

@@ -1,24 +1,34 @@
 Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
+                          /\
-//                         o6666666o                              //
+                         |  |
-//                         88" . "88                              //
+                         |  |
-//                         (| ^_^ |)                              //
+                        .'  '.
-//                         O\  =  /O                              //
+                        |    |
-//                      ____/`---'\____                           //
+                        |    |
-//                    .'  \\|     |//  `.                         //
+                        | /\ |
-//                   /  \\|||  :  |||//  \                        //
+                      .' |__|'.
-//                  /  _||||| -:- |||||-  \                       //
+                      |  |  |  |
-//                  |   | \\\  -  /// |   |                       //
+                     .'  |  |  '.
-//                  | \_|  ''\---/''  |   |                       //
+                /\   |   \__/   |   /\
-//                  \  .-\__  `-`  ___/-. /                       //
+               |  |  |   |  |   |  |  |
-//                ___`. .'  /--.--\  `. . ___                     //
+           /|  |  |,-\   |  |   /-,|  |  |\
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+           ||  |,-'   |  |  |  |   '-,|  ||
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+           ||-'       |  |  |  |       '-||
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+|\     _,-'           |  |  |  |           '-,_     /|
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
+||  ,-'   _           |  |  |  |               '-,  ||
-//                           `=---='                              //
+||-'    =(*)=         |  |  |  |                  '-||
+||                    |  \  /  |                    ||
+|\________....--------\   ||   /--------....________/|
+                      /|  ||  |\
+                     / |  ||  | \
+                    /  |  \/  |  \
+                   /   |      |   \
+                 //   .|      |.   \\
+               .' |_./ |      | \._| '.
+              /     _.-|||  |||-._     \
+              \__.-'   \||/\||/   '-.__/
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
+//             飞机保佑       永不宕机      永无BUG               //
 ////////////////////////////////////////////////////////////////////

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  Double protectedLands;
+    private  String protectedLands;
 
-    private  Double nonProtectedLands;
+    private  String nonProtectedLands;
 
-    private  Double mountain;
+    private  String mountain;
 
-    private  Double nonMountain;
+    private  String nonMountain;
 
     public String getId() {
         return id;
@@ -55,35 +55,35 @@ public class AorestCoverageVO extends  SysBaseEntity {
         this.regionEn = regionEn;
     }
 
-    public Double getProtectedLands() {
+    public String getProtectedLands() {
         return protectedLands;
     }
 
-    public void setProtectedLands(Double protectedLands) {
+    public void setProtectedLands(String protectedLands) {
         this.protectedLands = protectedLands;
     }
 
-    public Double getNonProtectedLands() {
+    public String getNonProtectedLands() {
         return nonProtectedLands;
     }
 
-    public void setNonProtectedLands(Double nonProtectedLands) {
+    public void setNonProtectedLands(String nonProtectedLands) {
         this.nonProtectedLands = nonProtectedLands;
     }
 
-    public Double getMountain() {
+    public String getMountain() {
         return mountain;
     }
 
-    public void setMountain(Double mountain) {
+    public void setMountain(String mountain) {
         this.mountain = mountain;
     }
 
-    public Double getNonMountain() {
+    public String getNonMountain() {
         return nonMountain;
     }
 
-    public void setNonMountain(Double nonMountain) {
+    public void setNonMountain(String nonMountain) {
         this.nonMountain = nonMountain;
     }
 }

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 extends SysBaseEntity
+public class AustraliaMiddleEastVO
 {
     private  String id;
 
@@ -22,15 +22,8 @@ public class AustraliaMiddleEastVO extends SysBaseEntity
 
     private  String createdBy;
 
-    private  LocalDate createdTime;
+    private  String createdTime;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 
     public LocalDate getYearMonth() {
         return yearMonth;
@@ -80,11 +73,19 @@ public class AustraliaMiddleEastVO extends SysBaseEntity
         this.createdBy = createdBy;
     }
 
-    public LocalDate getCreatedTime() {
+    public String getCreatedTime() {
         return createdTime;
     }
 
-    public void setCreatedTime(LocalDate createdTime) {
+    public void setCreatedTime(String createdTime) {
         this.createdTime = createdTime;
     }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java

@@ -5,65 +5,5 @@ package com.ruoyi.system.domain_yada;
  * @Author: JinSheng Song
  * @Date: 2022/5/20 14:07
  */
-public class GlobalTypeVO extends  SysBaseEntity {
+public class GlobalTypeVO {
-
-    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;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java

@@ -1,62 +1,9 @@
 package com.ruoyi.system.domain_yada;
 
-import java.time.LocalDate;
-
 /**+
  * 海面温度监测
  * @Author: JinSheng Song
  * @Date: 2022/5/20 14:08
  */
-public class OceanTemperatureVO extends SysBaseEntity
+public class OceanTemperatureVO {
-{
-
-    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;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java

@@ -6,75 +6,5 @@ package com.ruoyi.system.domain_yada;
  * @Date: 2022/5/20 14:09
  */
 
-public class RegionalSystemVO  extends SysBaseEntity{
+public class RegionalSystemVO {
-
-    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;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java

@@ -15,67 +15,61 @@ public class SysBaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 创建者 */
-    private String createBy;
+    private String createdBy;
 
     /** 创建时间 */
-    private LocalDateTime createTime;
+    private LocalDateTime createdTime;
 
     /** 更新者 */
-    private String updateBy;
+    private String updatedBy;
 
     /** 更新时间 */
-    private LocalDateTime updateTime;
+    private LocalDateTime updatedTime;
 
     /** 备注 */
-    private String remark;
+    private String remarks;
 
     /** 请求参数 */
     private Map<String, Object> params;
 
-    public String getCreateBy()
+    public String getCreatedBy() {
-    {
+        return createdBy;
-        return createBy;
     }
 
-    public void setCreateBy(String createBy)
+    public void setCreatedBy(String createdBy) {
-    {
+        this.createdBy = createdBy;
-        this.createBy = createBy;
     }
 
-    public LocalDateTime getCreateTime() {
+    public LocalDateTime getCreatedTime() {
-        return createTime;
+        return createdTime;
     }
 
-    public void setCreateTime(LocalDateTime createTime) {
+    public void setCreatedTime(LocalDateTime createdTime) {
-        this.createTime = createTime;
+        this.createdTime = createdTime;
     }
 
-    public String getUpdateBy()
+    public String getUpdatedBy() {
-    {
+        return updatedBy;
-        return updateBy;
     }
 
-    public void setUpdateBy(String updateBy)
+    public void setUpdatedBy(String updatedBy) {
-    {
+        this.updatedBy = updatedBy;
-        this.updateBy = updateBy;
     }
 
-    public LocalDateTime getUpdateTime() {
+    public LocalDateTime getUpdatedTime() {
-        return updateTime;
+        return updatedTime;
     }
 
-    public void setUpdateTime(LocalDateTime updateTime) {
+    public void setUpdatedTime(LocalDateTime updatedTime) {
-        this.updateTime = updateTime;
+        this.updatedTime = updatedTime;
     }
 
-    public String getRemark()
+    public String getRemarks() {
-    {
+        return remarks;
-        return remark;
     }
 
-    public void setRemark(String remark)
+    public void setRemarks(String remarks) {
-    {
+        this.remarks = remarks;
-        this.remark = remark;
     }
 
     public Map<String, Object> getParams()

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java

@@ -1,61 +0,0 @@
-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;
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java

@@ -1,91 +1,13 @@
 package com.ruoyi.system.domain_yada;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 平均植被覆盖度和净初级生产力
  * @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;
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java

@@ -1,19 +1,14 @@
 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<AorestCoverageVO> selectAorestCoverage();
+//    List<AustraliaMiddleEastVO> selectAustralia();
-
+//
-    Integer DelAorestCoverage(@Param("id") String id);
+//    Integer DelAustralia(@Param("id") String id);
-
+//
-    Integer IntoAorestCoverage(AorestCoverageVO eastVO);
+//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java

@@ -1,19 +1,14 @@
 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();
+//    List<AustraliaMiddleEastVO> selectAustralia();
-
+//
-    Integer DelGlobalType(@Param("id") String id);
+//    Integer DelAustralia(@Param("id") String id);
-
+//
-    Integer IntoGlobalType(GlobalTypeVO typeVO);
+//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java

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

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java

@@ -1,19 +1,14 @@
 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<RegionalSystemVO> selectRegional();
+//    List<AustraliaMiddleEastVO> selectAustralia();
-
+//
-    Integer DelRegional(@Param("id") String id);
+//    Integer DelAustralia(@Param("id") String id);
-
+//
-    Integer IntoRegional(RegionalSystemVO eastVO);
+//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java

@@ -1,20 +1,8 @@
 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);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java

@@ -1,19 +1,14 @@
 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();
+//    List<AustraliaMiddleEastVO> selectAustralia();
-
+//
-    Integer DelVegetation(@Param("id") String id);
+//    Integer DelAustralia(@Param("id") String id);
-
+//
-    Integer IntoVegetation(VegetationCoverageVO eastVO);
+//    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java

@@ -1,6 +1,5 @@
 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;
 
@@ -13,9 +12,9 @@ import java.util.List;
  */
 public interface IAorestCoverageService {
 
-    public List<AorestCoverageVO> selectAorestCoverage();
+    public List<AustraliaMiddleEastVO> selectAustralia();
 
-    public Integer DelAorestCoverage(@Param("id") String id);
+    public Integer DelAustralia(@Param("id") String id);
 
-    public Integer IntoAorestCoverage(AorestCoverageVO eastVO);
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java

@@ -1,7 +1,6 @@
 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;
@@ -13,9 +12,9 @@ import java.util.List;
  */
 public interface IGlobalTypeService {
 
-   public List<GlobalTypeVO> selectGlobalType();
+    public List<AustraliaMiddleEastVO> selectAustralia();
 
-   public   Integer DelGlobalType(String id);
+    public Integer DelAustralia(@Param("id") String id);
 
-   public Integer IntoGlobalType(GlobalTypeVO typeVO);
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java

@@ -1,7 +1,6 @@
 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;
@@ -13,9 +12,9 @@ import java.util.List;
  */
 public interface IOceanTemperatureService {
 
-    public List<OceanTemperatureVO> selectOcean();
+    public List<AustraliaMiddleEastVO> selectAustralia();
 
-    public Integer DelOcean(@Param("id") String id);
+    public Integer DelAustralia(@Param("id") String id);
 
-    public Integer IntoOcean(OceanTemperatureVO eastVO);
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java

@@ -1,7 +1,6 @@
 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;
@@ -13,9 +12,9 @@ import java.util.List;
  */
 public interface IRegionalSystemService {
 
-    public List<RegionalSystemVO> selectRegional();
+    public List<AustraliaMiddleEastVO> selectAustralia();
 
-    public Integer DelRegional(@Param("id") String id);
+    public Integer DelAustralia(@Param("id") String id);
 
-    public Integer IntoRegional(RegionalSystemVO eastVO);
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java

@@ -1,20 +1,9 @@
 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);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java

@@ -1,7 +1,6 @@
 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;
@@ -13,9 +12,9 @@ import java.util.List;
  */
 public interface IVegetationCoverageService {
 
-    public List<VegetationCoverageVO> selectVegetation();
+    public List<AustraliaMiddleEastVO> selectAustralia();
 
-    public Integer DelVegetation(String id);
+    public Integer DelAustralia(@Param("id") String id);
 
-    public Integer IntoVegetation(VegetationCoverageVO eastVO);
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java

@@ -1,8 +1,6 @@
 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;
@@ -16,21 +14,22 @@ import java.util.List;
  */
 public class AorestCoverageServiceimpl implements IAorestCoverageService {
     @Autowired
-    private AorestCoverageMapper coverageMapper;
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
-
 
     @Override
-    public List<AorestCoverageVO> selectAorestCoverage() {
+    public List<AustraliaMiddleEastVO> selectAustralia()
-        return coverageMapper.selectAorestCoverage();
+    {
+        return australiaMiddleEastMapper.selectAustralia();
     }
 
     @Override
-    public Integer DelAorestCoverage(String id) {
+    public Integer DelAustralia(String id) {
-        return coverageMapper.DelAorestCoverage(id);
+        return australiaMiddleEastMapper.DelAustralia(id);
+
     }
 
     @Override
-    public Integer IntoAorestCoverage(AorestCoverageVO eastVO) {
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return IntoAorestCoverage(eastVO);
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java

@@ -1,9 +1,7 @@
 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;
 
@@ -17,21 +15,22 @@ import java.util.List;
 public class GlobalTypeServiceimpl implements IGlobalTypeService {
 
     @Autowired
-    private GlobalTypeMapper typeMapper;
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
-
 
     @Override
-    public List<GlobalTypeVO> selectGlobalType() {
+    public List<AustraliaMiddleEastVO> selectAustralia()
-        return typeMapper.selectGlobalType();
+    {
+        return australiaMiddleEastMapper.selectAustralia();
     }
 
     @Override
-    public Integer DelGlobalType(String id) {
+    public Integer DelAustralia(String id) {
-        return typeMapper.DelGlobalType(id);
+        return australiaMiddleEastMapper.DelAustralia(id);
+
     }
 
     @Override
-    public Integer IntoGlobalType(GlobalTypeVO typeVO) {
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return typeMapper.IntoGlobalType(typeVO);
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java

@@ -1,9 +1,7 @@
 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;
 
@@ -17,21 +15,22 @@ import java.util.List;
 public class OceanTemperatureServiceimpl implements IOceanTemperatureService {
 
     @Autowired
-    private OceanTemperatureMapper oceanMapper;
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
-
 
     @Override
-    public List<OceanTemperatureVO> selectOcean() {
+    public List<AustraliaMiddleEastVO> selectAustralia()
-        return oceanMapper.selectOcean();
+    {
+        return australiaMiddleEastMapper.selectAustralia();
     }
 
     @Override
-    public Integer DelOcean(String id) {
+    public Integer DelAustralia(String id) {
-        return oceanMapper.DelOcean(id);
+        return australiaMiddleEastMapper.DelAustralia(id);
+
     }
 
     @Override
-    public Integer IntoOcean(OceanTemperatureVO eastVO) {
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return oceanMapper.IntoOcean(eastVO);
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java

@@ -1,9 +1,7 @@
 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;
 
@@ -17,22 +15,22 @@ import java.util.List;
 public class RegionalSystemServiceimpl implements IRegionalSystemService {
 
     @Autowired
-    private RegionalSystemMapper Regional;
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
-
 
     @Override
-    public List<RegionalSystemVO> selectRegional() {
+    public List<AustraliaMiddleEastVO> selectAustralia()
-        return Regional.selectRegional();
+    {
+        return australiaMiddleEastMapper.selectAustralia();
     }
 
     @Override
-    public Integer DelRegional(String id) {
+    public Integer DelAustralia(String id) {
-        return Regional.DelRegional(id);
+        return australiaMiddleEastMapper.DelAustralia(id);
+
     }
 
     @Override
-    public Integer IntoRegional(RegionalSystemVO eastVO) {
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return Regional.IntoRegional(eastVO);
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
     }
-
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java

@@ -1,12 +1,6 @@
 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;
 
 /**
  * * 城市监测
@@ -14,23 +8,4 @@ import java.util.List;
  * @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);
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java

@@ -1,9 +1,7 @@
 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;
 
@@ -18,21 +16,22 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService
 
 
     @Autowired
-    private VegetationCoverageMapper coverageMapper;
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
-
 
     @Override
-    public List<VegetationCoverageVO> selectVegetation() {
+    public List<AustraliaMiddleEastVO> selectAustralia()
-        return coverageMapper.selectVegetation();
+    {
+        return australiaMiddleEastMapper.selectAustralia();
     }
 
     @Override
-    public Integer DelVegetation(String id) {
+    public Integer DelAustralia(String id) {
-        return coverageMapper.DelVegetation(id);
+        return australiaMiddleEastMapper.DelAustralia(id);
+
     }
 
     @Override
-    public Integer IntoVegetation(VegetationCoverageVO eastVO) {
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
-        return coverageMapper.IntoVegetation(eastVO);
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
     }
 }

ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml

@@ -4,61 +4,5 @@ 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> 

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=DATE}
+                     #{createdTime,jdbcType=VARCHAR}
                  )
         ]]>
     </insert>

ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml

@@ -4,54 +4,4 @@ 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> 

ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml

@@ -4,52 +4,5 @@ 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> 

ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml

@@ -4,57 +4,5 @@ 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> 

ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml

@@ -4,52 +4,5 @@ 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> 

ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml

@@ -3,61 +3,6 @@
 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> 

ruoyi-ui/.env.development

@@ -1,11 +1,11 @@
-# 页面标题
+# 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 若依管理系统
-
+
-# 开发环境配置
+# 开发环境配置
-ENV = 'development'
+ENV = 'development'
-
+
-# 若依管理系统/开发环境
+# 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://192.168.2.105:9900'
-
+
-# 路由懒加载
+# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
+VUE_CLI_BABEL_TRANSPILE_MODULES = true