From aab12640b0c00e52b2fe6c8fecc1b0e1b39c1e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E9=87=91=E7=94=9F?= <1921620649@qq.com> Date: Tue, 1 Nov 2022 15:29:00 +0800 Subject: [PATCH] no message --- .../yada/AorestCoverageController.java | 109 ++++++++---------- .../yada/AustraliaMiddleEastController.java | 47 ++++---- .../web/controller/yada/CityController.java | 26 ++--- .../yada/CityExpandControllerr.java | 35 +++--- .../yada/ForestDetectionControer.java | 27 +++-- .../controller/yada/GlobalTypeController.java | 41 +++---- .../yada/OceanTemperatureController.java | 38 +++--- .../controller/yada/RegionVGIController.java | 44 ++++--- .../yada/RegionalSystemController.java | 38 +++--- .../controller/yada/SpecialController.java | 54 +++++---- .../yada/SpecialReportController.java | 80 ++++++------- .../yada/ThematicMapController.java | 57 ++++----- .../web/controller/yada/UrbanController.java | 40 +++---- .../yada/VegetationCoverageController.java | 38 +++--- .../controller/yada/dictionaryController.java | 10 +- .../src/main/resources/application-druid.yml | 4 +- .../system/domain_yada/AorestCoverageVO.java | 19 +-- .../domain_yada/AustraliaMiddleEastVO.java | 13 +-- .../com/ruoyi/system/domain_yada/CastsVo.java | 21 ++-- .../ruoyi/system/domain_yada/ChangeTable.java | 10 +- .../ruoyi/system/domain_yada/CityFocusVO.java | 19 ++- .../system/domain_yada/CityInformation.java | 21 ++-- .../com/ruoyi/system/domain_yada/CityVo.java | 25 ++-- .../system/domain_yada/CloumnarTable.java | 10 +- .../ruoyi/system/domain_yada/Dictionary.java | 13 +-- .../ruoyi/system/domain_yada/ForecastVo.java | 6 +- .../system/domain_yada/ForestDetectionVO.java | 14 ++- .../system/domain_yada/GlobalTypeVO.java | 17 +-- .../com/ruoyi/system/domain_yada/LivesVo.java | 21 ++-- .../system/domain_yada/MapServicesVO.java | 18 +-- .../domain_yada/OceanTemperatureVO.java | 15 +-- .../ruoyi/system/domain_yada/Orientation.java | 12 +- .../system/domain_yada/OrientationVO.java | 15 ++- .../ruoyi/system/domain_yada/RegionVGIVO.java | 18 +-- .../system/domain_yada/RegionalSystemVO.java | 17 +-- .../ruoyi/system/domain_yada/SpecialVO.java | 23 ++-- .../system/domain_yada/SysBaseEntity.java | 56 ++++----- .../system/domain_yada/ThematicMapDomain.java | 7 +- .../system/domain_yada/TypeConversion.java | 49 +++++++- .../ruoyi/system/domain_yada/TypeTable.java | 18 ++- .../ruoyi/system/domain_yada/UploadFile.java | 11 +- .../system/domain_yada/UploadSpecialVO.java | 15 ++- .../com/ruoyi/system/domain_yada/UrbanVO.java | 11 +- .../domain_yada/VegetationCoverageVO.java | 20 ++-- .../system/domain_yada/WeatherUtilsVO.java | 11 +- .../mapper_yada/AorestCoverageMapper.java | 2 +- .../AustraliaMiddleEastMapper.java | 1 + .../system/mapper_yada/CityExpandMapper.java | 12 +- .../mapper_yada/ForestDetectionMapper.java | 3 + .../service_yada/IAorestCoverageService.java | 4 +- .../service_yada/IForestDetectionService.java | 3 + .../service_yada/IRegionVGIService.java | 3 + .../service_yada/ThematicMapService.java | 9 +- .../impl/AorestCoverageServiceimpl.java | 7 +- .../impl/AustraliaMiddleEastServiceimpl.java | 9 +- .../impl/CityExpandServiceimpl.java | 10 +- .../service_yada/impl/CityServiceimpl.java | 5 +- .../impl/ForestDetectionServiceImpl.java | 6 + .../impl/GlobalTypeServiceimpl.java | 1 + .../impl/OceanTemperatureServiceimpl.java | 1 + .../impl/RegionVGIServiceimpl.java | 1 + .../impl/RegionalSystemServiceimpl.java | 1 + .../impl/SpecialReportServiceimpl.java | 5 +- .../impl/ThematicMapServiceImpl.java | 16 ++- .../service_yada/impl/UrbanServiceimpl.java | 3 +- .../impl/VegetationCoverageServiceimpl.java | 1 + .../mapper/system/ForestDetectionMapper.xml | 6 +- 67 files changed, 692 insertions(+), 630 deletions(-) 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 332a5770d..c70b6ea48 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 @@ -28,7 +28,7 @@ import java.time.LocalDateTime; import java.util.List; /** - * 森林覆盖率 + * 森林覆盖率 */ @RestController @RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8") @@ -43,110 +43,103 @@ public class AorestCoverageController { /** * 查询方法 * 需要查询的字段参数 + * * @return 参数类 */ - @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.GET}) - @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectAorestCoverage() - { - List eastVOSList= service.selectAorestCoverage(); + @RequestMapping(value = "/selectAorestCoverage", method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法", httpMethod = "GET") + public AjaxResult selectAorestCoverage() { + List eastVOSList = service.selectAorestCoverage(); return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.DELETE}) + @RequestMapping(value = "/DelAorestCoverage", method = {RequestMethod.DELETE}) @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") - public AjaxResult DelAorestCoverage(@Param("ID") String ID) - { + @ApiOperation(value = "删除方法", httpMethod = "DELETE") + public AjaxResult DelAorestCoverage(@Param("ID") String ID) { int NUM = service.DelAorestCoverage(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST}) - @ApiOperation(value = "新增方法",httpMethod = "POST") - public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS) - { + @RequestMapping(value = "/IntoAorestCoverage", method = {RequestMethod.POST}) + @ApiOperation(value = "新增方法", httpMethod = "POST") + public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS) { try { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = service.IntoAorestCoverage(eastVOS); - if (NUM>0) - { + int NUM = service.IntoAorestCoverage(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); - } - catch (Exception E){ - E.getMessage(); - return AjaxResult.error(); + return AjaxResult.error(); + } catch (Exception E) { + E.getMessage(); + return AjaxResult.error(); } } /** * 上传文件 + * * @return 状态码 */ - @RequestMapping(value = "/IntoUpLoad",method = {RequestMethod.POST}) - @ApiOperation(value = "上传文件",httpMethod = "POST") - public AjaxResult IntoUpload(@RequestBody MultipartFile file) - { - UploadFile upload=new UploadFile(); + @RequestMapping(value = "/IntoUpLoad", method = {RequestMethod.POST}) + @ApiOperation(value = "上传文件", httpMethod = "POST") + public AjaxResult IntoUpload(@RequestBody MultipartFile file) { + UploadFile upload = new UploadFile(); - ThematicMapDomain domain=new ThematicMapDomain(); + ThematicMapDomain domain = new ThematicMapDomain(); - UploadFile value= null; + UploadFile value = null; try { - value = uploadFile(file,upload); + value = uploadFile(file, upload); } catch (Exception e) { e.printStackTrace(); } - int NUM = service.IntoUpload(value); + int NUM = service.IntoUpload(value); domain.setPictureCode(value.getFileId()); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 文件查询 + * * @param response 头 - * @param request 客户端请求 + * @param request 客户端请求 * @return */ - @RequestMapping(value = "/selectUpload",method = {RequestMethod.GET}) - @ApiOperation(value = "文件查询",httpMethod = "GET") - public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request,@RequestBody UploadFile upload) - { - List eastVOSList= service.selectUpload(upload.getFileId(),upload.getFileName()); + @RequestMapping(value = "/selectUpload", method = {RequestMethod.GET}) + @ApiOperation(value = "文件查询", httpMethod = "GET") + public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request, @RequestBody UploadFile upload) { + List eastVOSList = service.selectUpload(upload.getFileId(), upload.getFileName()); return AjaxResult.success(eastVOSList); } - - - public UploadFile uploadFile(MultipartFile file,UploadFile upload) throws Exception - { + public UploadFile uploadFile(MultipartFile file, UploadFile upload) throws Exception { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 @@ -156,23 +149,21 @@ public class AorestCoverageController { upload.setFilePath(fileName); upload.setFileSize(String.valueOf(file.getSize())); upload.setCreateTime(LocalDateTime.now()); - return upload; + return upload; } - @RequestMapping(value = "/dictionary",method = {RequestMethod.GET}) + @RequestMapping(value = "/dictionary", method = {RequestMethod.GET}) // @ApiOperation(value = "字典查询",httpMethod = "GET") - public AjaxResult Dictionary(String type,String type1,String type2) - { - List diclist=service.selectDic(type); - return AjaxResult.success(diclist); + public AjaxResult Dictionary(String type, String type1, String type2) { + List diclist = service.selectDic(type); + return AjaxResult.success(diclist); - } + } - @RequestMapping(value = "/selectNow",method = {RequestMethod.GET}) - @ApiOperation(value = "字典查询",httpMethod = "GET") - public AjaxResult selectNow(String type) - { - List diclist=service.selectNow(type); + @RequestMapping(value = "/selectNow", method = {RequestMethod.GET}) + @ApiOperation(value = "字典查询", httpMethod = "GET") + public AjaxResult selectNow(String type) { + List diclist = service.selectNow(type); return AjaxResult.success(diclist); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index 98f0edea0..8d9566bf5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -20,62 +20,59 @@ import java.time.LocalDateTime; import java.util.List; /** - * 澳大利亚中东部地区 + * 澳大利亚中东部地区 */ @RestController @RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8") @Api(tags = "澳大利亚中东部地区") -public class AustraliaMiddleEastController -{ +public class AustraliaMiddleEastController { @Resource private IAustraliaMiddleEastService australiaMiddleEastService; /** * 查询方法 - * @return 实体类 + * + * @return 实体类 */ - @ApiOperation(value = "查询方法",httpMethod = "GET") - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.GET}) - public AjaxResult SelectAustralia(@RequestBody AustraliaMiddleEastVO eastVO ) - { - List eastVOSList= australiaMiddleEastService.selectAustralia(eastVO.getYearMonth(),eastVO.getMonth()); - return AjaxResult.success(eastVOSList); + @ApiOperation(value = "查询方法", httpMethod = "GET") + @RequestMapping(value = "/SelectAustralia", method = {RequestMethod.GET}) + public AjaxResult SelectAustralia(@RequestBody AustraliaMiddleEastVO eastVO) { + List eastVOSList = australiaMiddleEastService.selectAustralia(eastVO.getYearMonth(), eastVO.getMonth()); + return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.DELETE}) + @RequestMapping(value = "/DelAustralia", method = {RequestMethod.DELETE}) @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") - public AjaxResult DelAustralia(@Param("ID") String ID) - { + @ApiOperation(value = "删除方法", httpMethod = "DELETE") + public AjaxResult DelAustralia(@Param("ID") String ID) { int NUM = australiaMiddleEastService.DelAustralia(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - @ApiOperation(value = "新增方法",httpMethod = "POST") - public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS) - { + @RequestMapping(value = "/IntoAustralia", method = {RequestMethod.POST}) + @ApiOperation(value = "新增方法", httpMethod = "POST") + public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); - if (NUM>0) - { + int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java index 8a3936a26..b2a660f0c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java @@ -20,27 +20,23 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/City", produces = "application/json;charset=UTF-8") @Api(tags = "城市") -public class CityController -{ +public class CityController { @Resource private ICityService cityService; - - @RequestMapping(value = "/getImpervious",method = {RequestMethod.GET}) - @ApiOperation(value = "不透水面面积",httpMethod = "GET") - public AjaxResult getImpervious(String city,String country) - { - List cityVos=cityService.selectCity(city,country); - return AjaxResult.success(cityVos); + @RequestMapping(value = "/getImpervious", method = {RequestMethod.GET}) + @ApiOperation(value = "不透水面面积", httpMethod = "GET") + public AjaxResult getImpervious(String city, String country) { + List cityVos = cityService.selectCity(city, country); + return AjaxResult.success(cityVos); } - @RequestMapping(value = "/getOrientation",method = {RequestMethod.GET}) - @ApiOperation(value = "不透水面扩张方向",httpMethod = "GET") - public AjaxResult getOrientation(String city,String country) - { - List cityVos=cityService.selectOrientation(city,country); - return AjaxResult.success(cityVos); + @RequestMapping(value = "/getOrientation", method = {RequestMethod.GET}) + @ApiOperation(value = "不透水面扩张方向", httpMethod = "GET") + public AjaxResult getOrientation(String city, String country) { + List cityVos = cityService.selectOrientation(city, country); + return AjaxResult.success(cityVos); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java index 63a983e85..4a898d448 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java @@ -17,58 +17,59 @@ import java.util.List; /** * 城市扩张 + * * @Author: JinSheng Song * @Date: 2022/7/1 10:09 */ @RestController -@RequestMapping(value = "/CityExpand",produces = "application/json;charset=UTF-8") -public class CityExpandControllerr -{ +@RequestMapping(value = "/CityExpand", produces = "application/json;charset=UTF-8") +public class CityExpandControllerr { @Resource private ICityExpandService service; /** * 获取城市扩张方位 + * * @param city * @param year * @return */ - @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET}) - public AjaxResult selectCityExpand(@RequestParam(value = "city",required = false) String city, - @RequestParam(value = "country",required = false) String country, String year) - { - List value=service.selectExpand(city,country,year); - return AjaxResult.success(value); + @RequestMapping(value = "/selectCityExpand", method = {RequestMethod.GET}) + public AjaxResult selectCityExpand(@RequestParam(value = "city", required = false) String city, + @RequestParam(value = "country", required = false) String country, String year) { + List value = service.selectExpand(city, country, year); + return AjaxResult.success(value); } /** * 获取不透水面扩张方位 + * * @param city * @param superior * @return */ - @RequestMapping(value = "/selectOrientation",method = {RequestMethod.GET}) - public AjaxResult selectOrientation(String city,String superior,String country) - { - List value=service.selectOrientation(city,superior,country); - return AjaxResult.success(value); + @RequestMapping(value = "/selectOrientation", method = {RequestMethod.GET}) + public AjaxResult selectOrientation(String city, String superior, String country) { + List value = service.selectOrientation(city, superior, country); + return AjaxResult.success(value); } /** * 获取城市不透水面各种信息 + * * @param city * @param country * @return */ - @RequestMapping(value = "/selectInformation",method = {RequestMethod.GET}) - public AjaxResult selectInformation(String city,String country,String year,String basin){ + @RequestMapping(value = "/selectInformation", method = {RequestMethod.GET}) + public AjaxResult selectInformation(String city, String country, String year, String basin) { // if (city.equals("")&&country.equals("")) // { // List value= service.selectMain(year); // return AjaxResult.success(value); // } - List value= service.selectInfrom(city,country,year,basin); + List value = service.selectInfrom(city, country, year, basin); return AjaxResult.success(value); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestDetectionControer.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestDetectionControer.java index 2e3eef36e..31a2f8cae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestDetectionControer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestDetectionControer.java @@ -1,10 +1,7 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domain_yada.ChangeTable; -import com.ruoyi.system.domain_yada.CloumnarTable; -import com.ruoyi.system.domain_yada.ForestDetectionVO; -import com.ruoyi.system.domain_yada.TypeTable; +import com.ruoyi.system.domain_yada.*; import com.ruoyi.system.service_yada.IForestDetectionService; import com.ruoyi.system.service_yada.impl.ForestDetectionServiceImpl; import io.swagger.annotations.Api; @@ -23,21 +20,21 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/forest", produces = "application/json;charset=UTF-8") @Api(tags = "森林检测") -public class ForestDetectionControer -{ +public class ForestDetectionControer { @Resource private IForestDetectionService service; - @RequestMapping(value = "/select",method = {RequestMethod.GET}) - public AjaxResult select() - { - ForestDetectionVO forest=new ForestDetectionVO(); + @RequestMapping(value = "/select", method = {RequestMethod.GET}) + public AjaxResult select() { + ForestDetectionVO forest = new ForestDetectionVO(); - List changes=service.selectChange(); + List changes = service.selectChange(); - List cloumnars=service.selectCloumnar(); + List cloumnars = service.selectCloumnar(); - List types=service.selectType(); + List types = service.selectType(); + + List conversions = service.selectConversion(); forest.setChanges(changes); @@ -45,7 +42,9 @@ public class ForestDetectionControer forest.setTypes(types); - return AjaxResult.success("成功",forest); + forest.setConversions(conversions); + + return AjaxResult.success("成功", forest); } 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 0a6e18146..b20ff9299 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 @@ -22,7 +22,7 @@ import java.time.LocalDateTime; import java.util.List; /** - *全球各类型占比 + * 全球各类型占比 */ @RestController @RequestMapping("/monitor/clobal") @@ -33,52 +33,49 @@ public class GlobalTypeController { /** * 查询方法 - + * * @return 参数类 */ - @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST}) - @ApiOperation(value = "查询方法",httpMethod = "POST") - public AjaxResult selectGlobalType() - { - List eastVOSList= typeService.selectGlobalType(); + @RequestMapping(value = "/selectGlobalType", method = {RequestMethod.POST}) + @ApiOperation(value = "查询方法", httpMethod = "POST") + public AjaxResult selectGlobalType() { + List eastVOSList = typeService.selectGlobalType(); return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @RequestMapping(value = "/DelGlobalType", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) - public AjaxResult DelGlobalType(@Param("ID") String ID) - { + public AjaxResult DelGlobalType(@Param("ID") String ID) { int NUM = typeService.DelGlobalType(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST}) - public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS) - { + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/IntoGlobalType", method = {RequestMethod.POST}) + public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = typeService.IntoGlobalType(eastVOS); - if (NUM>0) - { + int NUM = typeService.IntoGlobalType(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } 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 b3f2e7b1c..08060d6f2 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 @@ -33,51 +33,49 @@ public class OceanTemperatureController { /** * 查询方法 + * * @return 参数类 */ - @RequestMapping(value = "/selectOcean",method = {RequestMethod.GET}) - @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectOcean(@RequestBody OceanTemperatureVO temperatureVO) - { - List eastVOSList= temperatureService.selectOcean(temperatureVO.getStartDate()); + @RequestMapping(value = "/selectOcean", method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法", httpMethod = "GET") + public AjaxResult selectOcean(@RequestBody OceanTemperatureVO temperatureVO) { + List eastVOSList = temperatureService.selectOcean(temperatureVO.getStartDate()); return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelOcean",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @RequestMapping(value = "/DelOcean", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) - public AjaxResult DelOcean(@Param("ID") String ID) - { + public AjaxResult DelOcean(@Param("ID") String ID) { int NUM = temperatureService.DelOcean(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoOcean(@RequestBody OceanTemperatureVO eastVOS) - { + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/IntoAustralia", method = {RequestMethod.POST}) + public AjaxResult IntoOcean(@RequestBody OceanTemperatureVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = temperatureService.IntoOcean(eastVOS); - if (NUM>0) - { + int NUM = temperatureService.IntoOcean(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index f71be8a26..02bd31fea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -21,61 +21,59 @@ import java.time.LocalDateTime; import java.util.List; /** - * 各区域VGI + * 各区域VGI */ @Api(tags = "各区域VGI") @RestController @RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8") -public class RegionVGIController -{ +public class RegionVGIController { @Resource private IRegionVGIService regionVGIService; + /** * 查询方法 + * * @return 参数类 */ - @RequestMapping(value = "/SelectRegion",method = {RequestMethod.GET}) - @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult SelectRegion() - { - List vgivost= regionVGIService.selectRegion(); + @RequestMapping(value = "/SelectRegion", method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法", httpMethod = "GET") + public AjaxResult SelectRegion() { + List vgivost = regionVGIService.selectRegion(); return AjaxResult.success(vgivost); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelRegion",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @RequestMapping(value = "/DelRegion", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) - public AjaxResult DelRegion(@Param("ID") String ID) - { + public AjaxResult DelRegion(@Param("ID") String ID) { int NUM = regionVGIService.DelRegion(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param vgivo 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/IntoRegion",method = {RequestMethod.POST}) - public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo) - { + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/IntoRegion", method = {RequestMethod.POST}) + public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo) { vgivo.setCreatedTime(LocalDateTime.now()); - int NUM = regionVGIService.IntoRegion(vgivo); - if (NUM>0) - { + int NUM = regionVGIService.IntoRegion(vgivo); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } 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 c7de177fe..e66c2b99e 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 @@ -27,50 +27,48 @@ public class RegionalSystemController { /** * 查询方法 + * * @return 参数类 */ - @RequestMapping(value = "/selectRegional",method = {RequestMethod.GET}) - @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectRegional(@RequestParam("region") String region) - { - List eastVOSList= systemService.selectRegional(region); + @RequestMapping(value = "/selectRegional", method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法", httpMethod = "GET") + public AjaxResult selectRegional(@RequestParam("region") String region) { + List eastVOSList = systemService.selectRegional(region); return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelRegional",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @RequestMapping(value = "/DelRegional", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) - public AjaxResult DelRegional(@RequestParam("ID") String ID) - { + public AjaxResult DelRegional(@RequestParam("ID") String ID) { int NUM = systemService.DelRegional(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST}) - public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS) - { + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/IntoRegional", method = {RequestMethod.POST}) + public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = systemService.IntoRegional(eastVOS); - if (NUM>0) - { + int NUM = systemService.IntoRegional(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java index 5d5c9bea3..927445618 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java @@ -56,6 +56,7 @@ public class SpecialController { private IRegionalSystemService systemService; /** + * */ @RequestMapping(value = "/helpSaveExcel") @@ -65,20 +66,23 @@ public class SpecialController { return IntoRegion(value); } - @RequestMapping(value = "/helpWeatherClass",method = {RequestMethod.GET}) - public AjaxResult helpWeatherClass(String city,String type) - { - String url="https://restapi.amap.com/v3/weather/weatherInfo"; - Map map=new HashMap<>(); - map.put("key","37087f0a3007dc67d37859553cd02d33"); - map.put("city",city); - if (type!=null){ map.put("extensions",type);} - map.put("output","json"); - String value= WeatherUtils.httpRequest(url,map); - WeatherUtilsVO vo = JSON.parseObject(value,WeatherUtilsVO.class); + @RequestMapping(value = "/helpWeatherClass", method = {RequestMethod.GET}) + public AjaxResult helpWeatherClass(String city, String type) { + String url = "https://restapi.amap.com/v3/weather/weatherInfo"; + Map map = new HashMap<>(); + map.put("key", "37087f0a3007dc67d37859553cd02d33"); + map.put("city", city); + if (type != null) { + map.put("extensions", type); + } + map.put("output", "json"); + String value = WeatherUtils.httpRequest(url, map); + WeatherUtilsVO vo = JSON.parseObject(value, WeatherUtilsVO.class); return AjaxResult.success(vo); - } /** + } + + /** * 森林覆盖率模板导入 */ @RequestMapping(value = "/helpExcelAorest") @@ -89,7 +93,7 @@ public class SpecialController { } /** - *平均植被覆盖度和净初级生产力 + * 平均植被覆盖度和净初级生产力 */ @RequestMapping(value = "/helpExcelnpp") private AjaxResult helpExcelnpp(@RequestBody MultipartFile file) { @@ -118,18 +122,16 @@ public class SpecialController { return IntoRegional(value); } - public AjaxResult IntoRegional(List eastVOS) - { + public AjaxResult IntoRegional(List eastVOS) { try { for (int i = 0; i < eastVOS.size(); i++) { eastVOS.get(i).setCreateTime(LocalDateTime.now()); systemService.IntoRegional(eastVOS.get(i)); } return AjaxResult.success(); - } - catch (Exception E){ + } catch (Exception E) { E.getMessage(); - return AjaxResult.error(E.getMessage()); + return AjaxResult.error(E.getMessage()); } } @@ -154,33 +156,29 @@ public class SpecialController { } - public AjaxResult IntoAorestCoverage(List eastVOS) - { + public AjaxResult IntoAorestCoverage(List eastVOS) { try { for (int i = 0; i < eastVOS.size(); i++) { eastVOS.get(i).setCreateTime(LocalDateTime.now()); service.IntoAorestCoverage(eastVOS.get(i)); } return AjaxResult.success(); - } - catch (Exception E){ + } catch (Exception E) { E.getMessage(); - return AjaxResult.error(E.getMessage()); + return AjaxResult.error(E.getMessage()); } } - public AjaxResult IntoVegetation(List eastVOS) - { + public AjaxResult IntoVegetation(List eastVOS) { try { for (int i = 0; i < eastVOS.size(); i++) { eastVOS.get(i).setCreateTime(LocalDateTime.now()); coverageService.IntoVegetation(eastVOS.get(i)); } return AjaxResult.success(); - } - catch (Exception E){ + } catch (Exception E) { E.getMessage(); - return AjaxResult.error(E.getMessage()); + return AjaxResult.error(E.getMessage()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java index 16150ae5b..08d7f4309 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java @@ -21,80 +21,74 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/Special", produces = "application/json;charset=UTF-8") @Api(tags = "专题报告") -public class SpecialReportController -{ +public class SpecialReportController { @Resource private ISpecialReportService service; - @RequestMapping(value = "/getSpecial",method = {RequestMethod.GET}) - @ApiOperation(value = "返回专题数据",httpMethod = "GET") - public AjaxResult getSpecial(String zone) - { - List value=service.selectSpecial(zone); + @RequestMapping(value = "/getSpecial", method = {RequestMethod.GET}) + @ApiOperation(value = "返回专题数据", httpMethod = "GET") + public AjaxResult getSpecial(String zone) { + List value = service.selectSpecial(zone); - return AjaxResult.success(value); + return AjaxResult.success(value); } - @RequestMapping(value = "/DelSpecial",method = {RequestMethod.GET}) - @ApiOperation(value = "删除专题数据",httpMethod = "GET") - public AjaxResult DelSpecial(@RequestParam("id") Integer id) - { - Integer value=service.DelSpecial(id); - if (value>0){ - return AjaxResult.success("成功！"); - }else { - return AjaxResult.error(); + @RequestMapping(value = "/DelSpecial", method = {RequestMethod.GET}) + @ApiOperation(value = "删除专题数据", httpMethod = "GET") + public AjaxResult DelSpecial(@RequestParam("id") Integer id) { + Integer value = service.DelSpecial(id); + if (value > 0) { + return AjaxResult.success("成功！"); + } else { + return AjaxResult.error(); } } - @RequestMapping(value = "/updateUploadSpecial",method = {RequestMethod.GET}) - @ApiOperation(value = "修改下载数量",httpMethod = "GET") - public AjaxResult updateUploadSpecial(@RequestParam("id") Integer id) - { - Integer value=service.updateUploadSpecial(id); + @RequestMapping(value = "/updateUploadSpecial", method = {RequestMethod.GET}) + @ApiOperation(value = "修改下载数量", httpMethod = "GET") + public AjaxResult updateUploadSpecial(@RequestParam("id") Integer id) { + Integer value = service.updateUploadSpecial(id); - if (value>0){return AjaxResult.success("成功！");} - return AjaxResult.error(); + if (value > 0) { + return AjaxResult.success("成功！"); + } + return AjaxResult.error(); } @RequestMapping(value = "/getUploadSpecial") @ApiOperation(value = "返回专题通报") - public AjaxResult getUploadSpecial(String fileName) - { - List value=service.selectUploadSpecial(fileName); + public AjaxResult getUploadSpecial(String fileName) { + List value = service.selectUploadSpecial(fileName); - return AjaxResult.success(value); + return AjaxResult.success(value); } @RequestMapping(value = "/getUploadStandard") @ApiOperation(value = "返回专题规范") - public AjaxResult getUploadStandard(String fileName) - { - List value=service.selectUploadSpecial1(fileName); + public AjaxResult getUploadStandard(String fileName) { + List value = service.selectUploadSpecial1(fileName); - return AjaxResult.success(value); + return AjaxResult.success(value); } - @RequestMapping(value = "/getWord",method = {RequestMethod.GET}) - @ApiOperation(value = "返回专题报告路径",httpMethod = "GET") - public AjaxResult getWord(@RequestParam("path") String path,@RequestParam("name") String name) - { - String route=""; - switch (path) - { + @RequestMapping(value = "/getWord", method = {RequestMethod.GET}) + @ApiOperation(value = "返回专题报告路径", httpMethod = "GET") + public AjaxResult getWord(@RequestParam("path") String path, @RequestParam("name") String name) { + String route = ""; + switch (path) { case "ch": - route="avatar/word/陆域中文1130.pdf"; + route = "avatar/word/陆域中文1130.pdf"; break; case "en": - route="avatar/word/陆域中文1130.pdf"; + route = "avatar/word/陆域中文1130.pdf"; break; default: - return AjaxResult.error("未找到对应路径"); + return AjaxResult.error("未找到对应路径"); } - return AjaxResult.success(route); + return AjaxResult.success(route); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index 7e9bcaf87..feb7f4bab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -23,6 +23,7 @@ import java.util.List; /** * 专题图模块 + * * @author taco chen */ @RestController @@ -35,78 +36,78 @@ public class ThematicMapController { /** * 查询专题图 + * * @param response 响应头 * @return 参数类 */ @ApiOperation("获取所有专题图") @ApiImplicitParams({}) @ApiResponses({ - @ApiResponse(code =200,message = "请求成功"), - @ApiResponse(code =401,message = "没有认证"), - @ApiResponse(code =403,message = "权限不足"), - @ApiResponse(code =404,message = "未找到") + @ApiResponse(code = 200, message = "请求成功"), + @ApiResponse(code = 401, message = "没有认证"), + @ApiResponse(code = 403, message = "权限不足"), + @ApiResponse(code = 404, message = "未找到") }) - @RequestMapping(value = "/get/all",method = {RequestMethod.POST}) - public AjaxResult selectAllThematicMap(HttpServletResponse response,@RequestBody ThematicMapDomain thematicMapDomain) - { - List res= thematicMapService.selectAll(thematicMapDomain.getPictureType(), - thematicMapDomain.getPictureTypeOne(),thematicMapDomain.getPictureTypeTwo()); + @RequestMapping(value = "/get/all", method = {RequestMethod.POST}) + public AjaxResult selectAllThematicMap(HttpServletResponse response, @RequestBody ThematicMapDomain thematicMapDomain) { + List res = thematicMapService.selectAll(thematicMapDomain.getPictureType(), + thematicMapDomain.getPictureTypeOne(), thematicMapDomain.getPictureTypeTwo()); return AjaxResult.success(res); } /** * 查询地图服务 + * * @param response 响应头 * @return 参数类 */ @ApiOperation("所有地图服务") @ApiImplicitParams({}) @ApiResponses({ - @ApiResponse(code =200,message = "请求成功"), - @ApiResponse(code =401,message = "没有认证"), - @ApiResponse(code =403,message = "权限不足"), - @ApiResponse(code =404,message = "未找到") + @ApiResponse(code = 200, message = "请求成功"), + @ApiResponse(code = 401, message = "没有认证"), + @ApiResponse(code = 403, message = "权限不足"), + @ApiResponse(code = 404, message = "未找到") }) - @RequestMapping(value = "/get/map",method = {RequestMethod.GET}) + @RequestMapping(value = "/get/map", method = {RequestMethod.GET}) public AjaxResult selectMap(HttpServletResponse response, - String chartType,String chartName,String particularYear) - { - List res= thematicMapService.selMapServers(chartName,chartType,particularYear); + String chartType, String chartName, String particularYear) { + List res = thematicMapService.selMapServers(chartName, chartType, particularYear); return AjaxResult.success(res); } /** * 删除方法 + * * @param id id * @return 状态码 */ - @RequestMapping(value = "/delete",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @RequestMapping(value = "/delete", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class) - public AjaxResult deleteThematicMap(@Param("id") Long id) - { + public AjaxResult deleteThematicMap(@Param("id") Long id) { int num = thematicMapService.deleteById(id); - if (num>0) { + if (num > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param thematicMapDomain 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/add",method = {RequestMethod.POST}) - public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain) - { + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/add", method = {RequestMethod.POST}) + public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain) { thematicMapDomain.setCreatedTime(LocalDateTime.now()); int num = thematicMapService.save(thematicMapDomain); - if (num>0) { + if (num > 0) { return AjaxResult.success(); } return AjaxResult.error(); 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 d95dcf485..73de1e16d 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 @@ -33,52 +33,50 @@ public class UrbanController { /** * 查询方法 + * * @param response 响应头 - * @param request 客户端请求 + * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/selectUrban",method = {RequestMethod.GET}) - @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request,@RequestBody UrbanVO urbanVO) - { - List eastVOSList= urbanService.selectUrban(urbanVO.getName(),urbanVO.getParticularYear()); + @RequestMapping(value = "/selectUrban", method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法", httpMethod = "GET") + public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request, @RequestBody UrbanVO urbanVO) { + List eastVOSList = urbanService.selectUrban(urbanVO.getName(), urbanVO.getParticularYear()); return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelUrban",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") - public AjaxResult DelUrban(@Param("ID") String ID) - { + @RequestMapping(value = "/DelUrban", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") + public AjaxResult DelUrban(@Param("ID") String ID) { int NUM = urbanService.DelUrban(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST}) + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/IntoUrban", method = {RequestMethod.POST}) @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class) - public AjaxResult IntoUrban(@RequestBody UrbanVO eastVOS) - { + public AjaxResult IntoUrban(@RequestBody UrbanVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = urbanService.IntoUrban(eastVOS); - if (NUM>0) - { + int NUM = urbanService.IntoUrban(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } 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 6408f3bf8..ba27161fb 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 @@ -33,50 +33,48 @@ public class VegetationCoverageController { /** * 查询方法 + * * @return 参数类 */ - @RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET}) - @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectVegetation(String type) - { - List eastVOSList= coverageService.selectVegetation(type); + @RequestMapping(value = "/selectVegetation", method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法", httpMethod = "GET") + public AjaxResult selectVegetation(String type) { + List eastVOSList = coverageService.selectVegetation(type); return AjaxResult.success(eastVOSList); } /** * 删除方法 + * * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelVegetation",method = {RequestMethod.DELETE}) - @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @RequestMapping(value = "/DelVegetation", method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法", httpMethod = "DELETE") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class) - public AjaxResult DelVegetation(@Param("ID") String ID) - { + public AjaxResult DelVegetation(@Param("ID") String ID) { int NUM = coverageService.DelVegetation(ID); - if (NUM>0) - { + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } /** * 新增方法 + * * @param eastVOS 新增实体类 * @return 状态码 */ - @ApiOperation(value = "新增方法",httpMethod = "POST") - @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST}) - public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS) - { + @ApiOperation(value = "新增方法", httpMethod = "POST") + @RequestMapping(value = "/IntoVegetation", method = {RequestMethod.POST}) + public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); - int NUM = coverageService.IntoVegetation(eastVOS); - if (NUM>0) - { + int NUM = coverageService.IntoVegetation(eastVOS); + if (NUM > 0) { return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/dictionaryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/dictionaryController.java index f3e7bad81..70dcb2721 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/dictionaryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/dictionaryController.java @@ -17,16 +17,14 @@ import java.util.List; */ @RestController @RequestMapping(value = "/dictionary", produces = "application/json;charset=UTF-8") -public class dictionaryController -{ +public class dictionaryController { @Resource private IAorestCoverageService service; - @RequestMapping(value = "/select",method = {RequestMethod.GET}) - public AjaxResult Dictionary(String type) - { - List diclist=service.selectDic(type); + @RequestMapping(value = "/select", method = {RequestMethod.GET}) + public AjaxResult Dictionary(String type) { + List diclist = service.selectDic(type); return AjaxResult.success(diclist); } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a67f058ed..85a4c7602 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,8 +6,8 @@ spring: driver-class-name: org.postgresql.Driver druid: master: - #url: jdbc:postgresql://121.36.229.60:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai - url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai + url: jdbc:postgresql://121.36.229.60:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai + #url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai username: sjs password: song5325 # url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai 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 4129f3b7e..9e58e0407 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 @@ -2,26 +2,27 @@ package com.ruoyi.system.domain_yada; /** * 森林覆盖率 + * * @Author: JinSheng Song * @Date: 2022/5/20 14:06 */ -public class AorestCoverageVO extends SysBaseEntity { +public class AorestCoverageVO extends SysBaseEntity { - private String id; + private String id; - private String particularYear; + private String particularYear; - private String region; + private String region; - private String regionEn; + private String regionEn; - private Double protectedLands; + private Double protectedLands; - private Double nonProtectedLands; + private Double nonProtectedLands; - private Double mountain; + private Double mountain; - private Double nonMountain; + private Double nonMountain; public String getId() { return id; 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 37a1e34ff..d8a869436 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,21 +6,20 @@ import java.time.LocalDate; * @Author: JinSheng Song * @Date: 2022/5/19 14:50 */ -public class AustraliaMiddleEastVO extends SysBaseEntity -{ - private String id; +public class AustraliaMiddleEastVO extends SysBaseEntity { + private String id; private String yearMonth; private String month; - private Double sstAnomalyIndex; + private Double sstAnomalyIndex; - private Double temperatureAnomolies; + private Double temperatureAnomolies; - private Double precipitationAnomolies; + private Double precipitationAnomolies; - private Double vaiAnomolies; + private Double vaiAnomolies; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java index 995efb013..0ab23dfa5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java @@ -6,27 +6,26 @@ import java.time.LocalDate; * @Author: JinSheng Song * @Date: 2022/6/10 10:04 */ -public class CastsVo -{ +public class CastsVo { private String date; - private String week; + private String week; - private String dayweather; + private String dayweather; - private String nightweather; + private String nightweather; - private String daytemp; + private String daytemp; - private String nighttemp; + private String nighttemp; - private String daywind; + private String daywind; - private String nightwind; + private String nightwind; - private String daypower; + private String daypower; - private String nightpower; + private String nightpower; public String getDate() { return date; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ChangeTable.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ChangeTable.java index e8ec318a0..f302e9ea4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ChangeTable.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ChangeTable.java @@ -6,15 +6,15 @@ package com.ruoyi.system.domain_yada; */ public class ChangeTable { - private String id; + private String id; - private String country; + private String country; - private String forestloss; + private String forestloss; - private String forestgain; + private String forestgain; - private String china; + private String china; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java index 0486a457f..c3235a708 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java @@ -4,25 +4,24 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/7/1 10:15 */ -public class CityFocusVO extends SysBaseEntity -{ - private String id; +public class CityFocusVO extends SysBaseEntity { + private String id; - private String xAxis; + private String xAxis; - private String yAxis; + private String yAxis; - private String city; + private String city; // private String year; - private String xAxisPy; + private String xAxisPy; - private String yAxisPy; + private String yAxisPy; - private String cityEn; + private String cityEn; - private String country; + private String country; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java index 4a76432e5..d3eb83962 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java @@ -4,18 +4,17 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/7/1 13:55 */ -public class CityInformation -{ - private String id; +public class CityInformation { + private String id; /** * 城市 */ - private String city; + private String city; /** * 城市 */ - private String cityEn; + private String cityEn; /** * 面积 */ @@ -23,11 +22,11 @@ public class CityInformation /** * 年份 */ - private String year; + private String year; /** * 不透水面面积km */ - private String imperviousSurfaceArea; + private String imperviousSurfaceArea; /** * 不透水面覆盖率% */ @@ -39,17 +38,17 @@ public class CityInformation /** * 不透水面扩张强度% */ - private String strength; + private String strength; /** * 不透水面扩张贡献度% */ - private String contribution; + private String contribution; /** * 所属国家 */ - private String superior; + private String superior; - private String country; + private String country; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java index 5491595d7..5d4417625 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java @@ -4,21 +4,20 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/6/24 9:51 */ -public class CityVo extends SysBaseEntity -{ - private String id; +public class CityVo extends SysBaseEntity { + private String id; - private String city; + private String city; - private String cityEn; + private String cityEn; - private String area; + private String area; - private String year; + private String year; - private Double imperviousSurfaceArea; + private Double imperviousSurfaceArea; - private Double imperviousSurfaceCoverage; + private Double imperviousSurfaceCoverage; public Double getImperviousSurfaceExpansionSpeed() { return imperviousSurfaceExpansionSpeed; @@ -28,13 +27,13 @@ public class CityVo extends SysBaseEntity this.imperviousSurfaceExpansionSpeed = imperviousSurfaceExpansionSpeed; } - private Double imperviousSurfaceExpansionSpeed; + private Double imperviousSurfaceExpansionSpeed; - private Double imperviousSurfaceExpansionStrength; + private Double imperviousSurfaceExpansionStrength; - private Double imperviousSurfaceExpansionCntribution ; + private Double imperviousSurfaceExpansionCntribution; - private String superior; + private String superior; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CloumnarTable.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CloumnarTable.java index a18a4296c..b19c10e46 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CloumnarTable.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CloumnarTable.java @@ -6,15 +6,15 @@ package com.ruoyi.system.domain_yada; */ public class CloumnarTable { - private String id; + private String id; - private String country; + private String country; - private String year; + private String year; - private String forestcover; + private String forestcover; - private String china; + private String china; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java index c485023aa..f16625eec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java @@ -5,19 +5,18 @@ package com.ruoyi.system.domain_yada; * @Date: 2022/5/30 8:50 */ //字典表 -public class Dictionary extends SysBaseEntity -{ - private String codingType; +public class Dictionary extends SysBaseEntity { + private String codingType; - private String codingType1; + private String codingType1; - private String codingType2; + private String codingType2; - private String dictionary; + private String dictionary; private String name; - private String nameEn; + private String nameEn; public String getCodingType1() { return codingType1; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java index 3ca9773f8..f3e1cdecc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java @@ -9,11 +9,11 @@ import java.util.List; */ public class ForecastVo { - private String city; + private String city; - private String adcode; + private String adcode; - private String province; + private String province; private String reporttime; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForestDetectionVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForestDetectionVO.java index a914727c4..cb2cbe1af 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForestDetectionVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForestDetectionVO.java @@ -11,9 +11,11 @@ public class ForestDetectionVO { private List changes; - private List cloumnars; + private List cloumnars; - private List types; + private List types; + + private List conversions; public List getChanges() { return changes; @@ -38,4 +40,12 @@ public class ForestDetectionVO { public void setTypes(List types) { this.types = types; } + + public List getConversions() { + return conversions; + } + + public void setConversions(List conversions) { + this.conversions = conversions; + } } 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 8ad864b2b..dfe7ea309 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 @@ -2,24 +2,25 @@ package com.ruoyi.system.domain_yada; /** * 全球各类型占比 + * * @Author: JinSheng Song * @Date: 2022/5/20 14:07 */ -public class GlobalTypeVO extends SysBaseEntity { +public class GlobalTypeVO extends SysBaseEntity { - private String id; + private String id; - private String typeName; + private String typeName; - private String typeNameEn; + private String typeNameEn; - private Double areaProportion; + private Double areaProportion; - private Double area; + private Double area; - private Double areaChange; + private Double areaChange; - private int particularYear; + private int particularYear; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java index 6a5d3fefb..36248d5a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java @@ -6,32 +6,31 @@ import java.time.LocalDateTime; * @Author: JinSheng Song * @Date: 2022/6/10 9:57 */ -public class LivesVo -{ +public class LivesVo { /** * 省份名 */ - private String province; + private String province; /** * 城市名 */ - private String city; + private String city; /** * 区域编码 */ - private String adcode; + private String adcode; /** - *天气现象 + * 天气现象 */ - private String weather; + private String weather; - private String temperature; + private String temperature; - private String winddirection; + private String winddirection; - private String windpower; + private String windpower; - private String humidity; + private String humidity; private LocalDateTime reporttime; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/MapServicesVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/MapServicesVO.java index 3e0ceaa7c..63bcda997 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/MapServicesVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/MapServicesVO.java @@ -2,34 +2,34 @@ package com.ruoyi.system.domain_yada; /** * 地图服务类 + * * @Author: JinSheng Song * @Date: 2022/6/30 15:48 */ -public class MapServicesVO extends SysBaseEntity -{ - private String id; +public class MapServicesVO extends SysBaseEntity { + private String id; /** * 地图类型 */ - private String chartType; + private String chartType; /** * 地图名称 */ - private String chartName; + private String chartName; /** * 图层 */ - private String layer; + private String layer; /** * 年份 */ - private String particularYear; + private String particularYear; /** * 分辨率 */ - private String resolvingPower; + private String resolvingPower; - private String serviceType; + private String serviceType; public String getId() { return id; 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 121f4ac8b..80bb23894 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 @@ -2,23 +2,24 @@ 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 extends SysBaseEntity { - private String id; + private String id; - private Integer ninoPhenomenon; + private Integer ninoPhenomenon; - private Integer laNina; + private Integer laNina; private LocalDate startDate; - private LocalDate endDate; + private LocalDate endDate; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java index d0128d961..7b93c73bd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java @@ -4,19 +4,19 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/7/1 11:08 */ -public class Orientation extends SysBaseEntity{ +public class Orientation extends SysBaseEntity { - private String id; + private String id; - private String city; + private String city; /** * 扩张方位 */ - private String position; + private String position; - private String areaValue; + private String areaValue; - private String superior; + private String superior; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java index 0a5077b11..07982bc38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java @@ -4,21 +4,20 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/6/24 15:04 */ -public class OrientationVO extends SysBaseEntity -{ - private String id; +public class OrientationVO extends SysBaseEntity { + private String id; - private String city; + private String city; - private String position; + private String position; private Double areaValue; - private String superior; + private String superior; - private String cityEn; + private String cityEn; - private String country; + private String country; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java index 41601576b..bfb22d9ad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java @@ -9,23 +9,23 @@ import java.time.LocalDateTime; * @Date: 2022/5/19 16:53 */ public class RegionVGIVO implements Serializable { - private String id; + private String id; - private String region; + private String region; - private String regionEn; + private String regionEn; - private String typeName; + private String typeName; - private String typeNameEn; + private String typeNameEn; - private Double forest; + private Double forest; - private Double grassland; + private Double grassland; - private String particularYear; + private String particularYear; - private String createdBy; + private String createdBy; private LocalDateTime createdTime; 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 3a36550b4..f314edb39 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 @@ -2,25 +2,26 @@ package com.ruoyi.system.domain_yada; /** * 区域生态系统 + * * @Author: JinSheng Song * @Date: 2022/5/20 14:09 */ -public class RegionalSystemVO extends SysBaseEntity{ +public class RegionalSystemVO extends SysBaseEntity { - private String id; + private String id; - private String region; + private String region; - private String regionEn; + private String regionEn; - private String typeConversion; + private String typeConversion; - private String typeconversionEn; + private String typeconversionEn; - private Double proportionOfChangedAreas; + private Double proportionOfChangedAreas; - private String particularYear; + private String particularYear; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java index b99ad0935..ab723d32b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java @@ -4,27 +4,26 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/7/20 11:48 */ -public class SpecialVO extends SysBaseEntity -{ - private String id; +public class SpecialVO extends SysBaseEntity { + private String id; - private String fileName; + private String fileName; - private String fileNameEn; + private String fileNameEn; - private String dateTime; + private String dateTime; - private String spaceDistinguish; + private String spaceDistinguish; - private String timeDistinguish; + private String timeDistinguish; - private String timeDistinguishEn; + private String timeDistinguishEn; - private String zone; + private String zone; - private String zoneEn; + private String zoneEn; - private String filePath; + private String filePath; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java index bdef7faee..eb44837cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java @@ -7,38 +7,47 @@ import java.util.Map; /** * Entity基类 - * + * * @author ruoyi */ -public class SysBaseEntity implements Serializable -{ +public class SysBaseEntity implements Serializable { private static final long serialVersionUID = 1L; - /** 创建者 */ + /** + * 创建者 + */ private String createBy; - /** 创建时间 */ + /** + * 创建时间 + */ private LocalDateTime createTime; - /** 更新者 */ + /** + * 更新者 + */ private String updateBy; - /** 更新时间 */ + /** + * 更新时间 + */ private LocalDateTime updateTime; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 请求参数 */ + /** + * 请求参数 + */ private Map params; - public String getCreateBy() - { + public String getCreateBy() { return createBy; } - public void setCreateBy(String createBy) - { + public void setCreateBy(String createBy) { this.createBy = createBy; } @@ -50,13 +59,11 @@ public class SysBaseEntity implements Serializable this.createTime = createTime; } - public String getUpdateBy() - { + public String getUpdateBy() { return updateBy; } - public void setUpdateBy(String updateBy) - { + public void setUpdateBy(String updateBy) { this.updateBy = updateBy; } @@ -68,27 +75,22 @@ public class SysBaseEntity implements Serializable this.updateTime = updateTime; } - public String getRemark() - { + public String getRemark() { return remark; } - public void setRemark(String remark) - { + public void setRemark(String remark) { this.remark = remark; } - public Map getParams() - { - if (params == null) - { + public Map getParams() { + if (params == null) { params = new HashMap<>(); } return params; } - public void setParams(Map params) - { + public void setParams(Map params) { this.params = params; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java index 04c5f86ea..6d9b5b2a3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; /** * 专题图实体类 + * * @Author: taco chen * @Date: 2022/5/20 14:09 */ @@ -15,7 +16,7 @@ public class ThematicMapDomain extends SysBaseEntity { private String pictureTypeOne; - private String pictureTypeTwo; + private String pictureTypeTwo; private String pictureZh; @@ -23,7 +24,7 @@ public class ThematicMapDomain extends SysBaseEntity { private String pictureName; - private String pictureNameEn; + private String pictureNameEn; private String pictureType; @@ -35,7 +36,7 @@ public class ThematicMapDomain extends SysBaseEntity { private String createdBy; - private String year; + private String year; private LocalDateTime createdTime; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeConversion.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeConversion.java index ce3275804..e1f5ec4f6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeConversion.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeConversion.java @@ -1,5 +1,50 @@ -package com.ruoyi.system.domain_yada;/** +package com.ruoyi.system.domain_yada; + +import java.lang.ref.PhantomReference; +import java.security.KeyStore; + +/** * @Author: JinSheng Song * @Date: 2022/11/1 15:17 - */public class TypeConversion { + */ +public class TypeConversion { + private String id; + + private String class1; + + private String increase; + + private String reduce; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getClass1() { + return class1; + } + + public void setClass1(String class1) { + this.class1 = class1; + } + + public String getIncrease() { + return increase; + } + + public void setIncrease(String increase) { + this.increase = increase; + } + + public String getReduce() { + return reduce; + } + + public void setReduce(String reduce) { + this.reduce = reduce; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeTable.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeTable.java index 3426e1aa6..fc546f4bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeTable.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/TypeTable.java @@ -8,13 +8,23 @@ import java.time.Period; */ public class TypeTable { - private String id; + private String id; - private String class1; + private String class1; - private String percentage; + private String percentage; - private String china; + private String china; + + private String year1; + + public String getYear1() { + return year1; + } + + public void setYear1(String year1) { + this.year1 = year1; + } public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java index 6d0529a9f..c7672e9c9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java @@ -6,17 +6,16 @@ import java.time.LocalDate; * @Author: JinSheng Song * @Date: 2022/5/24 14:24 */ -public class UploadFile extends SysBaseEntity -{ - private String id; +public class UploadFile extends SysBaseEntity { + private String id; private String fileId; - private String fileName; + private String fileName; - private String filePath; + private String filePath; - private String fileSize; + private String fileSize; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java index dd77518c8..5672e1637 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java @@ -7,14 +7,13 @@ import java.awt.*; * @Author: JinSheng Song * @Date: 2022/7/20 16:47 */ -public class UploadSpecialVO extends SysBaseEntity -{ +public class UploadSpecialVO extends SysBaseEntity { - private String id; + private String id; - private String fileName; + private String fileName; - private String fileNameEn; + private String fileNameEn; private String uploadNum; @@ -22,11 +21,11 @@ public class UploadSpecialVO extends SysBaseEntity private String type; - private String remarks1; + private String remarks1; - private String remarks2; + private String remarks2; - private String sign; + private String sign; public String getId() { return id; 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 index 04ce9382d..a5f4450aa 100644 --- 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 @@ -4,18 +4,19 @@ import java.time.LocalDate; /** * 城市监测 + * * @Author: JinSheng Song * @Date: 2022/5/20 16:55 */ -public class UrbanVO extends SysBaseEntity{ +public class UrbanVO extends SysBaseEntity { - private String id; + private String id; private String particularYear; - private String name; + private String name; - private String nameEn; + private String nameEn; public String getId() { return id; @@ -57,5 +58,5 @@ public class UrbanVO extends SysBaseEntity{ this.urbanArea = urbanArea; } - private Double 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 ad01b1bfb..536422b4e 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 @@ -4,26 +4,26 @@ import java.time.LocalDate; /** * 平均植被覆盖度和净初级生产力 + * * @Author: JinSheng Song * @Date: 2022/5/20 14:09 */ -public class VegetationCoverageVO extends SysBaseEntity -{ - private String id; +public class VegetationCoverageVO extends SysBaseEntity { + private String id; - private String region; + private String region; - private String regionEn; + private String regionEn; - private String particularYear; + private String particularYear; - private Double mountain; + private Double mountain; - private Double nonMountain; + private Double nonMountain; - private Double protectedLands; + private Double protectedLands; - private Double nonProtectedLands; + private Double nonProtectedLands; public String getId() { return id; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java index e7449cc81..aa277e07f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java @@ -10,19 +10,19 @@ public class WeatherUtilsVO { /** * 接口返回状态 */ - private String status; + private String status; /** * 返回结果数量 */ - private String count; + private String count; - private String info; + private String info; - private String infocode; + private String infocode; /** * 实时天气预报 */ - private List lives; + private List lives; /** * 预报天气 */ @@ -66,7 +66,6 @@ public class WeatherUtilsVO { } - public List getForecasts() { return forecasts; } 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 d695de45c..b5e39429e 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 @@ -22,7 +22,7 @@ public interface AorestCoverageMapper { Integer IntoUpload(UploadFile file); - List selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName); + List selectUpload(@Param("fileId") String fileId, @Param("fileName") String fileName); List selectDic(@Param("codingType") String codingType); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java index aa2de864a..bcb2356c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java @@ -8,6 +8,7 @@ import java.util.List; /** * 澳大利亚中东部地区 + * * @Author: JinSheng Song * @Date: 2022/5/11 15:17 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java index 9df383e6d..fb98e77b2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java @@ -14,16 +14,16 @@ import java.util.List; public interface CityExpandMapper { List selectExpand(@Param("city") String city, - @Param("country") String country); + @Param("country") String country); - List selectOrientation( @Param("city") String city, - @Param("superior") String superior, - @Param("country") String country); + List selectOrientation(@Param("city") String city, + @Param("superior") String superior, + @Param("country") String country); List selectInfrom(@Param("city") String city, @Param("country") String country, @Param("year") String year, - @Param("basin")String basin); + @Param("basin") String basin); - List selectMain( @Param("year") String year); + List selectMain(@Param("year") String year); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ForestDetectionMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ForestDetectionMapper.java index ad1021721..0a3888b17 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ForestDetectionMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ForestDetectionMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper_yada; import com.ruoyi.system.domain_yada.ChangeTable; import com.ruoyi.system.domain_yada.CloumnarTable; +import com.ruoyi.system.domain_yada.TypeConversion; import com.ruoyi.system.domain_yada.TypeTable; import java.util.List; @@ -17,4 +18,6 @@ public interface ForestDetectionMapper { List selectCloumnar(); List selectChange(); + + List selectConversion(); } 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 95c5131f6..ffb385f3b 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 @@ -11,6 +11,7 @@ import java.util.List; /** * 森林覆盖率 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:32 */ @@ -24,8 +25,9 @@ public interface IAorestCoverageService { public Integer IntoUpload(UploadFile file); - public List selectUpload(String fileId,String fileName); + public List selectUpload(String fileId, String fileName); List selectDic(String codingType); + List selectNow(String codingType2); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IForestDetectionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IForestDetectionService.java index fbf6eb2f3..916d285f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IForestDetectionService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IForestDetectionService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service_yada; import com.ruoyi.system.domain_yada.ChangeTable; import com.ruoyi.system.domain_yada.CloumnarTable; +import com.ruoyi.system.domain_yada.TypeConversion; import com.ruoyi.system.domain_yada.TypeTable; import java.util.List; @@ -17,4 +18,6 @@ public interface IForestDetectionService { List selectCloumnar(); List selectChange(); + + List selectConversion(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java index 4c9b47f7b..06d47bd93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java @@ -13,12 +13,14 @@ public interface IRegionVGIService { /** * 查询 + * * @return */ public List selectRegion(/*String typeName,String particularYear*/); /** * 删除 + * * @param id * @return */ @@ -26,6 +28,7 @@ public interface IRegionVGIService { /** * 添加 + * * @param eastVO * @return */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java index f39154dcf..401d1603d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java @@ -9,6 +9,7 @@ import java.util.List; /** * 专题图服务 + * * @Author: taco chen * @Date: 2022/5/11 11:40 */ @@ -17,20 +18,23 @@ public interface ThematicMapService { /** * 获取全部专题图 + * * @return */ - List selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo); + List selectAll(String pictureType, String pictureTypeOne, String pictureTypeTwo); /** * 获取地图服务 + * * @param chartName * @param chartType * @return */ - List selMapServers(String chartName, String chartType,String particularYear); + List selMapServers(String chartName, String chartType, String particularYear); /** * 删除专题图根据编号 + * * @param id 编号 * @return */ @@ -38,6 +42,7 @@ public interface ThematicMapService { /** * 保存专题图 + * * @param thematicMapDomain * @return */ 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 5886132a2..c05272640 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 @@ -16,6 +16,7 @@ import java.util.List; /** * 森林覆盖率 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:43 */ @@ -47,16 +48,16 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService { @Override public List selectUpload(String fileId, String fileName) { - return coverageMapper.selectUpload(fileId,fileName); + return coverageMapper.selectUpload(fileId, fileName); } @Override public List selectDic(String codingType) { - return coverageMapper.selectDic(codingType); + return coverageMapper.selectDic(codingType); } @Override public List selectNow(String codingType2) { - return coverageMapper.selectNow(codingType2); + return coverageMapper.selectNow(codingType2); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java index df0e040de..d6327dcc8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java @@ -11,19 +11,18 @@ import java.util.List; /** * 亚大综合监测 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:43 */ @Service -public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService -{ +public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService { @Resource private AustraliaMiddleEastMapper australiaMiddleEastMapper; @Override - public List selectAustralia(String yearMonth,String month) - { - return australiaMiddleEastMapper.selectAustralia(yearMonth,month); + public List selectAustralia(String yearMonth, String month) { + return australiaMiddleEastMapper.selectAustralia(yearMonth, month); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java index bc9e82472..9d91333e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java @@ -26,17 +26,17 @@ public class CityExpandServiceimpl implements ICityExpandService { @Override public List selectExpand(String city, String country, String year) { - return mapper.selectExpand(city,country); + return mapper.selectExpand(city, country); } @Override - public List selectOrientation(String city, String superior,String country) { - return mapper.selectOrientation(city,superior,country); + public List selectOrientation(String city, String superior, String country) { + return mapper.selectOrientation(city, superior, country); } @Override - public List selectInfrom(String city, String country,String year,String basin) { - return mapper.selectInfrom(city,country,year,basin); + public List selectInfrom(String city, String country, String year, String basin) { + return mapper.selectInfrom(city, country, year, basin); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java index 88f937cc3..c362b1e60 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java @@ -19,13 +19,14 @@ public class CityServiceimpl implements ICityService { @Resource private CityMapper cityMapper; + @Override public List selectCity(String city, String gj) { - return cityMapper.selectCity(city,gj); + return cityMapper.selectCity(city, gj); } @Override public List selectOrientation(String city, String gj) { - return cityMapper.selectOrientation(city,gj); + return cityMapper.selectOrientation(city, gj); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ForestDetectionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ForestDetectionServiceImpl.java index 945f8548c..088b640b0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ForestDetectionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ForestDetectionServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service_yada.impl; import com.ruoyi.system.domain_yada.ChangeTable; import com.ruoyi.system.domain_yada.CloumnarTable; +import com.ruoyi.system.domain_yada.TypeConversion; import com.ruoyi.system.domain_yada.TypeTable; import com.ruoyi.system.mapper_yada.ForestDetectionMapper; import com.ruoyi.system.service_yada.IForestDetectionService; @@ -35,4 +36,9 @@ public class ForestDetectionServiceImpl implements IForestDetectionService { public List selectChange() { return mapper.selectChange(); } + + @Override + public List selectConversion() { + return mapper.selectConversion(); + } } 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 694609d3e..8ec7408f6 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 @@ -15,6 +15,7 @@ import java.util.List; /** * 全球各类型占比 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:47 */ 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 596ee1917..19c8c10ce 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 @@ -14,6 +14,7 @@ import java.util.List; /** * 森林监测 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:47 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java index 6beb25cd4..5bd34c547 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java @@ -12,6 +12,7 @@ import java.util.List; /** * 大气质量监测 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:45 */ 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 8ec0932ea..0e01c7b4e 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 @@ -14,6 +14,7 @@ import java.util.List; /** * 区域生态系统 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:46 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java index 08c4b8e88..b77b004de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java @@ -11,11 +11,12 @@ import java.util.List; /** * 专题报告 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:48 */ @Service -public class SpecialReportServiceimpl implements ISpecialReportService { +public class SpecialReportServiceimpl implements ISpecialReportService { @Resource private SpecialReportMapper mapper; @@ -32,7 +33,7 @@ public class SpecialReportServiceimpl implements ISpecialReportService { @Override public List selectUploadSpecial1(String fileName) { - return mapper.selectUploadSpecial1(fileName); + return mapper.selectUploadSpecial1(fileName); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java index 12aca3b8a..588ccb8bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java @@ -13,6 +13,7 @@ import java.util.List; /** * * 专题图服务 + * * @author : taco chen */ @Service @@ -23,35 +24,38 @@ public class ThematicMapServiceImpl implements ThematicMapService { /** * 获取全部专题图 + * * @return */ @Override - public List selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo){ - return thematicMapMapper.selectAllThematicMap(pictureType,pictureTypeOne,pictureTypeTwo); + public List selectAll(String pictureType, String pictureTypeOne, String pictureTypeTwo) { + return thematicMapMapper.selectAllThematicMap(pictureType, pictureTypeOne, pictureTypeTwo); } @Override - public List selMapServers(String chartName, String chartType,String particularYear) { - return thematicMapMapper.selMapServers(chartName,chartType,particularYear); + public List selMapServers(String chartName, String chartType, String particularYear) { + return thematicMapMapper.selMapServers(chartName, chartType, particularYear); } /** * 删除专题图根据编号 + * * @param id 编号 * @return */ @Override - public Integer deleteById(Long id){ + public Integer deleteById(Long id) { return thematicMapMapper.deleteThematicMap(id); } /** * 保存专题图 + * * @param thematicMapDomain * @return */ @Override - public Integer save(ThematicMapDomain thematicMapDomain){ + public Integer save(ThematicMapDomain thematicMapDomain) { return thematicMapMapper.saveThematicMap(thematicMapDomain); } } 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 db09793cd..840b5bebd 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 @@ -13,6 +13,7 @@ import java.util.List; /** * * 城市监测 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:49 */ @@ -25,7 +26,7 @@ public class UrbanServiceimpl implements IUrbanService { @Override public List selectUrban(String name, String particularYear) { - return urbanMapper.selectUrban(name,particularYear); + return urbanMapper.selectUrban(name, particularYear); } @Override 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 77be86694..b6902580b 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 @@ -14,6 +14,7 @@ import java.util.List; /** * 平均植被覆盖度和净初级生产力 + * * @Author: JinSheng Song * @Date: 2022/5/11 11:45 */ diff --git a/ruoyi-system/src/main/resources/mapper/system/ForestDetectionMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ForestDetectionMapper.xml index 402205b2d..084498877 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ForestDetectionMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ForestDetectionMapper.xml @@ -12,7 +12,7 @@ @@ -23,4 +23,8 @@ + + \ No newline at end of file