diff --git 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 index e4c956707..e805a6d1b 100644 --- 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 eastVOSList= australiaMiddleEastService.selectAustralia(); + List 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(); diff --git 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 index 3688a405b..13412d4f1 100644 --- 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 eastVOSList= australiaMiddleEastService.selectAustralia(); + List 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(); diff --git 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 index a49c90257..6b8be70f7 100644 --- 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 eastVOSList= australiaMiddleEastService.selectAustralia(); + List 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(); diff --git 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 index b4e368ef1..ab07b1012 100644 --- 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 eastVOSList= australiaMiddleEastService.selectAustralia(); + List 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(); diff --git 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 index e37af0c41..b2343fc86 100644 --- 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 eastVOSList= australiaMiddleEastService.selectAustralia(); + List 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(); diff --git 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 index 9c898ed93..df651c8e5 100644 --- 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 eastVOSList= australiaMiddleEastService.selectAustralia(); + List 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(); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0bbaeb4f1..eda7f36e9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: # 数据库索引 database: 3 # 密码 - password: yhy_app + password: sdust2020 # 连接超时时间 timeout: 10s lettuce: diff --git 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 index 02fea0533..4129f3b7e 100644 --- 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; } } diff --git 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 index 48f77d2fd..87fe6a59d 100644 --- 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; - } } diff --git 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 index 4666755e3..a1c20a217 100644 --- 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; + } } diff --git 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 index 79d7aa622..121f4ac8b 100644 --- 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; + } } diff --git 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 index 7f807bbb1..3a36550b4 100644 --- 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; + } } diff --git 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 new file mode 100644 index 000000000..04ce9382d --- /dev/null +++ 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; +} diff --git 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 index c0f8daa65..ad01b1bfb 100644 --- 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,9 +1,91 @@ package com.ruoyi.system.domain_yada; +import java.time.LocalDate; + /** * 平均植被覆盖度和净初级生产力 * @Author: JinSheng Song * @Date: 2022/5/20 14:09 */ -public class VegetationCoverageVO { +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; + } } diff --git 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 index ddce23614..0931f079f 100644 --- 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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectAorestCoverage(); + + Integer DelAorestCoverage(@Param("id") String id); + + Integer IntoAorestCoverage(AorestCoverageVO eastVO); } diff --git 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 index ca10f21a6..c6d93ba6c 100644 --- 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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectGlobalType(); + + Integer DelGlobalType(@Param("id") String id); + + Integer IntoGlobalType(GlobalTypeVO typeVO); } diff --git 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 index ff5594d07..9b7a33567 100644 --- 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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectOcean(); + + Integer DelOcean(@Param("id") String id); + + Integer IntoOcean(OceanTemperatureVO eastVO); + } diff --git 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 index 9fde98f60..6f7a342d3 100644 --- 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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectRegional(); + + Integer DelRegional(@Param("id") String id); + + Integer IntoRegional(RegionalSystemVO eastVO); } diff --git 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 index a3e80c76c..eb3e201d6 100644 --- 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 selectUrban(); + + Integer DelUrban(@Param("id") String id); + + Integer IntoUrban(UrbanVO eastVO); } diff --git 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 index 977c0d111..1b34d8d5b 100644 --- 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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectVegetation(); + + Integer DelVegetation(@Param("id") String id); + + Integer IntoVegetation(VegetationCoverageVO eastVO); } diff --git 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 index b43289501..938d9b3bb 100644 --- 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 selectAustralia(); + public List 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); } diff --git 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 index 3d9787e52..e09d8a5d3 100644 --- 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 selectAustralia(); + public List selectGlobalType(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelGlobalType(String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoGlobalType(GlobalTypeVO typeVO); } diff --git 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 index ce17df7ef..7191272d1 100644 --- 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 selectAustralia(); + public List 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); } diff --git 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 index 9a7126571..77a381a51 100644 --- 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 selectAustralia(); + public List 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); } diff --git 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 index 06bff3eb0..1955c293f 100644 --- 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 selectUrban(); + + public Integer DelUrban(@Param("id") String id); + + public Integer IntoUrban(UrbanVO eastVO); } diff --git 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 index be6e70782..350d0093e 100644 --- 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 selectAustralia(); + public List selectVegetation(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelVegetation(String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoVegetation(VegetationCoverageVO eastVO); } diff --git 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 index 007d88880..c1bb6a3c5 100644 --- 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 selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List 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); } } diff --git 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 index 905344219..dbf2d9560 100644 --- 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 selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List 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); } } diff --git 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 index 5f80f27be..cf4208b05 100644 --- 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 selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List 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); } } diff --git 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 index 08933a0ac..a34d7561e 100644 --- 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 selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List 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); } + } diff --git 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 index d5c77966d..134982bfb 100644 --- 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 selectUrban() { + return urbanMapper.selectUrban(); + } + + @Override + public Integer DelUrban(String id) { + return urbanMapper.DelUrban(id); + } + + @Override + public Integer IntoUrban(UrbanVO eastVO) { + return urbanMapper.IntoUrban(eastVO); + } } diff --git 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 index 62b71f4ae..897971389 100644 --- 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 selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List 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); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index 2f5f8d371..3250666ff 100644 --- 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"> + + + + + + + + + + + + + + + + + + + + + + DELETE FROM forest_coverage + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index 83a9015e8..731b4a8e8 100644 --- 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} ) ]]> diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 1c423e4d2..314d8ebae 100644 --- 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"> + + + + + + + + + + + + + + + + + + + + DELETE FROM proportion_of_global_types + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index 588e289d3..ddd304cf8 100644 --- 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"> + + + + + + + + + + + + + + + + + + + DELETE FROM sea_surface_temperature_anomaly + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index e1db72f9d..cf99c5370 100644 --- 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"> + + + + + + + + + + + + + + + + + + + + DELETE FROM proportion_of_ecosystem_type_transfer + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 45ba48a7d..779198a65 100644 --- 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"> + + + + + + + + + + + + + + + + + + + DELETE FROM urban_agglomeration_china + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index da8ae0ab5..24e0e6b33 100644 --- 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"> + + + + + + + + + + + + + + + + + + + + + DELETE FROM fvc_npp + WHERE ID=#{id} + + + + + \ No newline at end of file