no message

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

@@ -43,29 +43,28 @@ public class AorestCoverageController {
     /**
      * 查询方法
      * 需要查询的字段参数
+     *
      * @return 参数类
      */
     @RequestMapping(value = "/selectAorestCoverage", method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法", httpMethod = "GET")
-    public AjaxResult selectAorestCoverage()
+    public AjaxResult selectAorestCoverage() {
-    {
         List<AorestCoverageVO> eastVOSList = service.selectAorestCoverage();
         return AjaxResult.success(eastVOSList);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
     @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)
+    public AjaxResult DelAorestCoverage(@Param("ID") String ID) {
-    {
         int NUM = service.DelAorestCoverage(ID);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -74,25 +73,23 @@ public class AorestCoverageController {
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @RequestMapping(value = "/IntoAorestCoverage", method = {RequestMethod.POST})
     @ApiOperation(value = "新增方法", httpMethod = "POST")
-    public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS)
+    public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS) {
-    {
         try {
 
 
             eastVOS.setCreateTime(LocalDateTime.now());
             int NUM = service.IntoAorestCoverage(eastVOS);
-            if (NUM>0)
+            if (NUM > 0) {
-            {
                 return AjaxResult.success();
             }
             return AjaxResult.error();
-        }
+        } catch (Exception E) {
-        catch (Exception E){
             E.getMessage();
             return AjaxResult.error();
         }
@@ -100,12 +97,12 @@ public class AorestCoverageController {
 
     /**
      * 上传文件
+     *
      * @return 状态码
      */
     @RequestMapping(value = "/IntoUpLoad", method = {RequestMethod.POST})
     @ApiOperation(value = "上传文件", httpMethod = "POST")
-    public  AjaxResult IntoUpload(@RequestBody MultipartFile file)
+    public AjaxResult IntoUpload(@RequestBody MultipartFile file) {
-    {
         UploadFile upload = new UploadFile();
 
         ThematicMapDomain domain = new ThematicMapDomain();
@@ -120,8 +117,7 @@ public class AorestCoverageController {
         int NUM = service.IntoUpload(value);
         domain.setPictureCode(value.getFileId());
 
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -130,23 +126,20 @@ public class AorestCoverageController {
 
     /**
      * 文件查询
+     *
      * @param response 头
      * @param request  客户端请求
      * @return
      */
     @RequestMapping(value = "/selectUpload", method = {RequestMethod.GET})
     @ApiOperation(value = "文件查询", httpMethod = "GET")
-    public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request,@RequestBody UploadFile upload)
+    public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request, @RequestBody UploadFile upload) {
-    {
         List<UploadFile> 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();
         // 上传并返回新文件名称
@@ -161,8 +154,7 @@ public class AorestCoverageController {
 
     @RequestMapping(value = "/dictionary", method = {RequestMethod.GET})
 //    @ApiOperation(value = "字典查询",httpMethod = "GET")
-     public  AjaxResult Dictionary(String type,String type1,String type2)
+    public AjaxResult Dictionary(String type, String type1, String type2) {
-     {
         List<Dictionary> diclist = service.selectDic(type);
         return AjaxResult.success(diclist);
 
@@ -170,8 +162,7 @@ public class AorestCoverageController {
 
     @RequestMapping(value = "/selectNow", method = {RequestMethod.GET})
     @ApiOperation(value = "字典查询", httpMethod = "GET")
-    public  AjaxResult selectNow(String type)
+    public AjaxResult selectNow(String type) {
-    {
         List<Dictionary> diclist = service.selectNow(type);
         return AjaxResult.success(diclist);
     }

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

@@ -25,36 +25,34 @@ 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 实体类
      */
     @ApiOperation(value = "查询方法", httpMethod = "GET")
     @RequestMapping(value = "/SelectAustralia", method = {RequestMethod.GET})
-    public AjaxResult SelectAustralia(@RequestBody AustraliaMiddleEastVO eastVO )
+    public AjaxResult SelectAustralia(@RequestBody AustraliaMiddleEastVO eastVO) {
-    {
         List<AustraliaMiddleEastVO> eastVOSList = australiaMiddleEastService.selectAustralia(eastVO.getYearMonth(), eastVO.getMonth());
         return AjaxResult.success(eastVOSList);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
     @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)
+    public AjaxResult DelAustralia(@Param("ID") String ID) {
-    {
         int NUM = australiaMiddleEastService.DelAustralia(ID);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -63,17 +61,16 @@ public class AustraliaMiddleEastController
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @RequestMapping(value = "/IntoAustralia", method = {RequestMethod.POST})
     @ApiOperation(value = "新增方法", httpMethod = "POST")
-    public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS)
+    public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS) {
-    {
         eastVOS.setCreateTime(LocalDateTime.now());
         int NUM = australiaMiddleEastService.IntoAustralia(eastVOS);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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

@@ -20,17 +20,14 @@ 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)
+    public AjaxResult getImpervious(String city, String country) {
-    {
         List<CityVo> cityVos = cityService.selectCity(city, country);
         return AjaxResult.success(cityVos);
     }
@@ -38,8 +35,7 @@ public class CityController
 
     @RequestMapping(value = "/getOrientation", method = {RequestMethod.GET})
     @ApiOperation(value = "不透水面扩张方向", httpMethod = "GET")
-    public AjaxResult getOrientation(String city,String country)
+    public AjaxResult getOrientation(String city, String country) {
-    {
         List<OrientationVO> cityVos = cityService.selectOrientation(city, country);
         return AjaxResult.success(cityVos);
     }

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

@@ -17,46 +17,47 @@ 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
+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)
+                                       @RequestParam(value = "country", required = false) String country, String year) {
-    {
         List<CityFocusVO> 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)
+    public AjaxResult selectOrientation(String city, String superior, String country) {
-    {
         List<OrientationVO> value = service.selectOrientation(city, superior, country);
         return AjaxResult.success(value);
     }
 
     /**
      * 获取城市不透水面各种信息
+     *
      * @param city
      * @param country
      * @return

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.*;
-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.service_yada.IForestDetectionService;
 import com.ruoyi.system.service_yada.impl.ForestDetectionServiceImpl;
 import io.swagger.annotations.Api;
@@ -23,14 +20,12 @@ 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()
+    public AjaxResult select() {
-    {
         ForestDetectionVO forest = new ForestDetectionVO();
 
         List<ChangeTable> changes = service.selectChange();
@@ -39,12 +34,16 @@ public class ForestDetectionControer
 
         List<TypeTable> types = service.selectType();
 
+        List<TypeConversion> conversions = service.selectConversion();
+
         forest.setChanges(changes);
 
         forest.setCloumnars(cloumnars);
 
         forest.setTypes(types);
 
+        forest.setConversions(conversions);
+
         return AjaxResult.success("成功", forest);
 
     }

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

@@ -33,30 +33,28 @@ public class GlobalTypeController {
 
     /**
      * 查询方法
-
+     *
      * @return 参数类
      */
     @RequestMapping(value = "/selectGlobalType", method = {RequestMethod.POST})
     @ApiOperation(value = "查询方法", httpMethod = "POST")
-      public AjaxResult selectGlobalType()
+    public AjaxResult selectGlobalType() {
-    {
         List<GlobalTypeVO> eastVOSList = typeService.selectGlobalType();
         return AjaxResult.success(eastVOSList);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
     @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();
@@ -65,17 +63,16 @@ public class GlobalTypeController {
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @ApiOperation(value = "新增方法", httpMethod = "POST")
     @RequestMapping(value = "/IntoGlobalType", method = {RequestMethod.POST})
-    public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS)
+    public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS) {
-    {
         eastVOS.setCreateTime(LocalDateTime.now());
         int NUM = typeService.IntoGlobalType(eastVOS);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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

@@ -33,18 +33,19 @@ public class OceanTemperatureController {
 
     /**
      * 查询方法
+     *
      * @return 参数类
      */
     @RequestMapping(value = "/selectOcean", method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法", httpMethod = "GET")
-    public AjaxResult selectOcean(@RequestBody OceanTemperatureVO temperatureVO)
+    public AjaxResult selectOcean(@RequestBody OceanTemperatureVO temperatureVO) {
-    {
         List<OceanTemperatureVO> eastVOSList = temperatureService.selectOcean(temperatureVO.getStartDate());
         return AjaxResult.success(eastVOSList);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
@@ -52,11 +53,9 @@ public class OceanTemperatureController {
     @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();
@@ -65,17 +64,16 @@ public class OceanTemperatureController {
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @ApiOperation(value = "新增方法", httpMethod = "POST")
     @RequestMapping(value = "/IntoAustralia", method = {RequestMethod.POST})
-    public AjaxResult IntoOcean(@RequestBody  OceanTemperatureVO eastVOS)
+    public AjaxResult IntoOcean(@RequestBody OceanTemperatureVO eastVOS) {
-    {
         eastVOS.setCreateTime(LocalDateTime.now());
         int NUM = temperatureService.IntoOcean(eastVOS);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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

@@ -26,35 +26,34 @@ import java.util.List;
 @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()
+    public AjaxResult SelectRegion() {
-    {
         List<RegionVGIVO> vgivost = regionVGIService.selectRegion();
         return AjaxResult.success(vgivost);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
     @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();
@@ -63,17 +62,16 @@ public class RegionVGIController
 
     /**
      * 新增方法
+     *
      * @param vgivo 新增实体类
      * @return 状态码
      */
     @ApiOperation(value = "新增方法", httpMethod = "POST")
     @RequestMapping(value = "/IntoRegion", method = {RequestMethod.POST})
-    public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo)
+    public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo) {
-    {
         vgivo.setCreatedTime(LocalDateTime.now());
         int NUM = regionVGIService.IntoRegion(vgivo);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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

@@ -27,29 +27,28 @@ public class RegionalSystemController {
 
     /**
      * 查询方法
+     *
      * @return 参数类
      */
     @RequestMapping(value = "/selectRegional", method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法", httpMethod = "GET")
-    public AjaxResult selectRegional(@RequestParam("region") String region)
+    public AjaxResult selectRegional(@RequestParam("region") String region) {
-    {
         List<RegionalSystemVO> eastVOSList = systemService.selectRegional(region);
         return AjaxResult.success(eastVOSList);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
     @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();
@@ -58,17 +57,16 @@ public class RegionalSystemController {
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @ApiOperation(value = "新增方法", httpMethod = "POST")
     @RequestMapping(value = "/IntoRegional", method = {RequestMethod.POST})
-    public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS)
+    public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS) {
-    {
         eastVOS.setCreateTime(LocalDateTime.now());
         int NUM = systemService.IntoRegional(eastVOS);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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")
@@ -66,19 +67,22 @@ public class SpecialController {
     }
 
     @RequestMapping(value = "/helpWeatherClass", method = {RequestMethod.GET})
-    public  AjaxResult helpWeatherClass(String city,String type)
+    public AjaxResult helpWeatherClass(String city, String type) {
-    {
         String url = "https://restapi.amap.com/v3/weather/weatherInfo";
         Map<String, String> map = new HashMap<>();
         map.put("key", "37087f0a3007dc67d37859553cd02d33");
         map.put("city", city);
-        if (type!=null){ map.put("extensions",type);}
+        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")
@@ -118,16 +122,14 @@ public class SpecialController {
         return IntoRegional(value);
     }
 
-    public AjaxResult IntoRegional(List<RegionalSystemVO> eastVOS)
+    public AjaxResult IntoRegional(List<RegionalSystemVO> 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());
         }
@@ -154,31 +156,27 @@ public class SpecialController {
 
     }
 
-    public AjaxResult IntoAorestCoverage(List<AorestCoverageVO> eastVOS)
+    public AjaxResult IntoAorestCoverage(List<AorestCoverageVO> 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());
         }
     }
 
-    public AjaxResult IntoVegetation(List<VegetationCoverageVO> eastVOS)
+    public AjaxResult IntoVegetation(List<VegetationCoverageVO> 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());
         }

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

@@ -21,16 +21,14 @@ 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)
+    public AjaxResult getSpecial(String zone) {
-    {
         List<SpecialVO> value = service.selectSpecial(zone);
 
         return AjaxResult.success(value);
@@ -38,8 +36,7 @@ public class SpecialReportController
 
     @RequestMapping(value = "/DelSpecial", method = {RequestMethod.GET})
     @ApiOperation(value = "删除专题数据", httpMethod = "GET")
-    public AjaxResult DelSpecial(@RequestParam("id") Integer id)
+    public AjaxResult DelSpecial(@RequestParam("id") Integer id) {
-    {
         Integer value = service.DelSpecial(id);
         if (value > 0) {
             return AjaxResult.success("成功！");
@@ -51,19 +48,19 @@ public class SpecialReportController
 
     @RequestMapping(value = "/updateUploadSpecial", method = {RequestMethod.GET})
     @ApiOperation(value = "修改下载数量", httpMethod = "GET")
-    public AjaxResult updateUploadSpecial(@RequestParam("id") Integer id)
+    public AjaxResult updateUploadSpecial(@RequestParam("id") Integer id) {
-    {
         Integer value = service.updateUploadSpecial(id);
 
-        if (value>0){return  AjaxResult.success("成功！");}
+        if (value > 0) {
+            return AjaxResult.success("成功！");
+        }
         return AjaxResult.error();
 
     }
 
     @RequestMapping(value = "/getUploadSpecial")
     @ApiOperation(value = "返回专题通报")
-    public  AjaxResult getUploadSpecial(String fileName)
+    public AjaxResult getUploadSpecial(String fileName) {
-    {
         List<UploadSpecialVO> value = service.selectUploadSpecial(fileName);
 
         return AjaxResult.success(value);
@@ -71,8 +68,7 @@ public class SpecialReportController
 
     @RequestMapping(value = "/getUploadStandard")
     @ApiOperation(value = "返回专题规范")
-    public  AjaxResult getUploadStandard(String fileName)
+    public AjaxResult getUploadStandard(String fileName) {
-    {
         List<UploadSpecialVO> value = service.selectUploadSpecial1(fileName);
 
         return AjaxResult.success(value);
@@ -81,11 +77,9 @@ public class SpecialReportController
 
     @RequestMapping(value = "/getWord", method = {RequestMethod.GET})
     @ApiOperation(value = "返回专题报告路径", httpMethod = "GET")
-    public AjaxResult getWord(@RequestParam("path") String path,@RequestParam("name") String name)
+    public AjaxResult getWord(@RequestParam("path") String path, @RequestParam("name") String name) {
-    {
         String route = "";
-        switch (path)
+        switch (path) {
-        {
             case "ch":
                 route = "avatar/word/陆域中文1130.pdf";
                 break;

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,6 +36,7 @@ public class ThematicMapController {
 
     /**
      * 查询专题图
+     *
      * @param response 响应头
      * @return 参数类
      */
@@ -47,8 +49,7 @@ public class ThematicMapController {
             @ApiResponse(code = 404, message = "未找到")
     })
     @RequestMapping(value = "/get/all", method = {RequestMethod.POST})
-    public AjaxResult selectAllThematicMap(HttpServletResponse response,@RequestBody ThematicMapDomain thematicMapDomain)
+    public AjaxResult selectAllThematicMap(HttpServletResponse response, @RequestBody ThematicMapDomain thematicMapDomain) {
-    {
         List<ThematicMapDomain> res = thematicMapService.selectAll(thematicMapDomain.getPictureType(),
                 thematicMapDomain.getPictureTypeOne(), thematicMapDomain.getPictureTypeTwo());
         return AjaxResult.success(res);
@@ -57,6 +58,7 @@ public class ThematicMapController {
 
     /**
      * 查询地图服务
+     *
      * @param response 响应头
      * @return 参数类
      */
@@ -70,22 +72,21 @@ public class ThematicMapController {
     })
     @RequestMapping(value = "/get/map", method = {RequestMethod.GET})
     public AjaxResult selectMap(HttpServletResponse response,
-                                String chartType,String chartName,String particularYear)
+                                String chartType, String chartName, String particularYear) {
-    {
         List<MapServicesVO> res = thematicMapService.selMapServers(chartName, chartType, particularYear);
         return AjaxResult.success(res);
     }
 
     /**
      * 删除方法
+     *
      * @param id id
      * @return 状态码
      */
     @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) {
             return AjaxResult.success();
@@ -95,13 +96,13 @@ public class ThematicMapController {
 
     /**
      * 新增方法
+     *
      * @param thematicMapDomain 新增实体类
      * @return 状态码
      */
     @ApiOperation(value = "新增方法", httpMethod = "POST")
     @RequestMapping(value = "/add", method = {RequestMethod.POST})
-    public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain)
+    public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain) {
-    {
 
 
         thematicMapDomain.setCreatedTime(LocalDateTime.now());

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

@@ -33,30 +33,29 @@ public class UrbanController {
 
     /**
      * 查询方法
+     *
      * @param response 响应头
      * @param request  客户端请求
      * @return 参数类
      */
     @RequestMapping(value = "/selectUrban", method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法", httpMethod = "GET")
-    public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request,@RequestBody UrbanVO urbanVO)
+    public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request, @RequestBody UrbanVO urbanVO) {
-    {
         List<UrbanVO> 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)
+    public AjaxResult DelUrban(@Param("ID") String ID) {
-    {
         int NUM = urbanService.DelUrban(ID);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -65,18 +64,17 @@ public class UrbanController {
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @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)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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

@@ -33,29 +33,28 @@ public class VegetationCoverageController {
 
     /**
      * 查询方法
+     *
      * @return 参数类
      */
     @RequestMapping(value = "/selectVegetation", method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法", httpMethod = "GET")
-    public AjaxResult selectVegetation(String type)
+    public AjaxResult selectVegetation(String type) {
-    {
         List<VegetationCoverageVO> eastVOSList = coverageService.selectVegetation(type);
         return AjaxResult.success(eastVOSList);
     }
 
     /**
      * 删除方法
+     *
      * @param ID id
      * @return 状态码
      */
     @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();
@@ -64,17 +63,16 @@ public class VegetationCoverageController {
 
     /**
      * 新增方法
+     *
      * @param eastVOS 新增实体类
      * @return 状态码
      */
     @ApiOperation(value = "新增方法", httpMethod = "POST")
     @RequestMapping(value = "/IntoVegetation", method = {RequestMethod.POST})
-    public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS)
+    public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS) {
-    {
         eastVOS.setCreateTime(LocalDateTime.now());
         int NUM = coverageService.IntoVegetation(eastVOS);
-        if (NUM>0)
+        if (NUM > 0) {
-        {
             return AjaxResult.success();
         }
         return AjaxResult.error();

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

@@ -17,15 +17,13 @@ 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)
+    public AjaxResult Dictionary(String type) {
-    {
         List<Dictionary> diclist = service.selectDic(type);
         return AjaxResult.success(diclist);
 

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://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://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

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain_yada;
 
 /**
  * 森林覆盖率
+ *
  * @Author: JinSheng Song
  * @Date: 2022/5/20 14:06
  */

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

@@ -6,8 +6,7 @@ import java.time.LocalDate;
  * @Author: JinSheng Song
  * @Date: 2022/5/19 14:50
  */
-public class AustraliaMiddleEastVO extends SysBaseEntity
+public class AustraliaMiddleEastVO extends SysBaseEntity {
-{
     private String id;
 
     private String yearMonth;

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

@@ -6,8 +6,7 @@ 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;

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

@@ -4,8 +4,7 @@ package com.ruoyi.system.domain_yada;
  * @Author: JinSheng Song
  * @Date: 2022/7/1 10:15
  */
-public class CityFocusVO extends  SysBaseEntity
+public class CityFocusVO extends SysBaseEntity {
-{
     private String id;
 
     private String xAxis;

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

@@ -4,8 +4,7 @@ package com.ruoyi.system.domain_yada;
  * @Author: JinSheng Song
  * @Date: 2022/7/1 13:55
  */
-public class CityInformation
+public class CityInformation {
-{
     private String id;
 
     /**

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

@@ -4,8 +4,7 @@ package com.ruoyi.system.domain_yada;
  * @Author: JinSheng Song
  * @Date: 2022/6/24 9:51
  */
-public class CityVo extends SysBaseEntity
+public class CityVo extends SysBaseEntity {
-{
     private String id;
 
     private String city;

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

@@ -5,8 +5,7 @@ package com.ruoyi.system.domain_yada;
  * @Date: 2022/5/30 8:50
  */
 //字典表
-public class Dictionary extends SysBaseEntity
+public class Dictionary extends SysBaseEntity {
-{
     private String codingType;
 
     private String codingType1;

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

@@ -15,6 +15,8 @@ public class ForestDetectionVO {
 
     private List<TypeTable> types;
 
+    private List<TypeConversion> conversions;
+
     public List<ChangeTable> getChanges() {
         return changes;
     }
@@ -38,4 +40,12 @@ public class ForestDetectionVO {
     public void setTypes(List<TypeTable> types) {
         this.types = types;
     }
+
+    public List<TypeConversion> getConversions() {
+        return conversions;
+    }
+
+    public void setConversions(List<TypeConversion> conversions) {
+        this.conversions = conversions;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain_yada;
 
 /**
  * 全球各类型占比
+ *
  * @Author: JinSheng Song
  * @Date: 2022/5/20 14:07
  */

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

@@ -6,8 +6,7 @@ import java.time.LocalDateTime;
  * @Author: JinSheng Song
  * @Date: 2022/6/10 9:57
  */
-public class LivesVo
+public class LivesVo {
-{
     /**
      * 省份名
      */

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

@@ -2,11 +2,11 @@ package com.ruoyi.system.domain_yada;
 
 /**
  * 地图服务类
+ *
  * @Author: JinSheng Song
  * @Date: 2022/6/30 15:48
  */
-public class MapServicesVO extends SysBaseEntity
+public class MapServicesVO extends SysBaseEntity {
-{
     private String id;
     /**
      * 地图类型

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

@@ -2,13 +2,14 @@ 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;
 

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

@@ -4,8 +4,7 @@ package com.ruoyi.system.domain_yada;
  * @Author: JinSheng Song
  * @Date: 2022/6/24 15:04
  */
-public class OrientationVO extends SysBaseEntity
+public class OrientationVO extends SysBaseEntity {
-{
     private String id;
 
     private String city;

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain_yada;
 
 /**
  * 区域生态系统
+ *
  * @Author: JinSheng Song
  * @Date: 2022/5/20 14:09
  */

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

@@ -4,8 +4,7 @@ package com.ruoyi.system.domain_yada;
  * @Author: JinSheng Song
  * @Date: 2022/7/20 11:48
  */
-public class SpecialVO extends SysBaseEntity
+public class SpecialVO extends SysBaseEntity {
-{
     private String id;
 
     private String fileName;

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

@@ -10,35 +10,44 @@ import java.util.Map;
  *
  * @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<String, Object> 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<String, Object> getParams()
+    public Map<String, Object> getParams() {
-    {
+        if (params == null) {
-        if (params == null)
-        {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
+    public void setParams(Map<String, Object> params) {
-    {
         this.params = params;
     }
 

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
  */

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;
+    }
 }

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

@@ -16,6 +16,16 @@ public class TypeTable {
 
     private String china;
 
+    private String year1;
+
+    public String getYear1() {
+        return year1;
+    }
+
+    public void setYear1(String year1) {
+        this.year1 = year1;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -6,8 +6,7 @@ import java.time.LocalDate;
  * @Author: JinSheng Song
  * @Date: 2022/5/24 14:24
  */
-public class UploadFile  extends  SysBaseEntity
+public class UploadFile extends SysBaseEntity {
-{
     private String id;
 
     private String fileId;

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

@@ -7,8 +7,7 @@ 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;
 

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

@@ -4,6 +4,7 @@ import java.time.LocalDate;
 
 /**
  * 城市监测
+ *
  * @Author: JinSheng Song
  * @Date: 2022/5/20 16:55
  */

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

@@ -4,11 +4,11 @@ import java.time.LocalDate;
 
 /**
  * 平均植被覆盖度和净初级生产力
+ *
  * @Author: JinSheng Song
  * @Date: 2022/5/20 14:09
  */
-public class VegetationCoverageVO extends SysBaseEntity
+public class VegetationCoverageVO extends SysBaseEntity {
-{
     private String id;
 
     private String region;

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

@@ -66,7 +66,6 @@ public class WeatherUtilsVO {
     }
 
 
-
     public List<ForecastVo> getForecasts() {
         return forecasts;
     }

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
  */

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<CloumnarTable> selectCloumnar();
 
     List<ChangeTable> selectChange();
+
+    List<TypeConversion> selectConversion();
 }

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
  */
@@ -27,5 +28,6 @@ public interface IAorestCoverageService {
     public List<UploadFile> selectUpload(String fileId, String fileName);
 
     List<Dictionary> selectDic(String codingType);
+
     List<Dictionary> selectNow(String codingType2);
 }

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<CloumnarTable> selectCloumnar();
 
     List<ChangeTable> selectChange();
+
+    List<TypeConversion> selectConversion();
 }

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

@@ -13,12 +13,14 @@ public interface IRegionVGIService {
 
     /**
      * 查询
+     *
      * @return
      */
     public List<RegionVGIVO> selectRegion(/*String typeName,String particularYear*/);
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
@@ -26,6 +28,7 @@ public interface IRegionVGIService {
 
     /**
      * 添加
+     *
      * @param eastVO
      * @return
      */

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,12 +18,14 @@ public interface ThematicMapService {
 
     /**
      * 获取全部专题图
+     *
      * @return
      */
     List<ThematicMapDomain> selectAll(String pictureType, String pictureTypeOne, String pictureTypeTwo);
 
     /**
      * 获取地图服务
+     *
      * @param chartName
      * @param chartType
      * @return
@@ -31,6 +34,7 @@ public interface ThematicMapService {
 
     /**
      * 删除专题图根据编号
+     *
      * @param id 编号
      * @return
      */
@@ -38,6 +42,7 @@ public interface ThematicMapService {
 
     /**
      * 保存专题图
+     *
      * @param thematicMapDomain
      * @return
      */

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
  */

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

@@ -11,18 +11,17 @@ 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<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month)
+    public List<AustraliaMiddleEastVO> selectAustralia(String yearMonth, String month) {
-    {
         return australiaMiddleEastMapper.selectAustralia(yearMonth, month);
     }
 

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

@@ -19,6 +19,7 @@ public class CityServiceimpl implements ICityService {
 
     @Resource
     private CityMapper cityMapper;
+
     @Override
     public List<CityVo> selectCity(String city, String gj) {
         return cityMapper.selectCity(city, gj);

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<ChangeTable> selectChange() {
         return mapper.selectChange();
     }
+
+    @Override
+    public List<TypeConversion> selectConversion() {
+        return mapper.selectConversion();
+    }
 }

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
  */

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
  */

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
  */

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
  */

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

@@ -11,6 +11,7 @@ import java.util.List;
 
 /**
  * 专题报告
+ *
  * @Author: JinSheng Song
  * @Date: 2022/5/11 11:48
  */

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,6 +24,7 @@ public class ThematicMapServiceImpl implements ThematicMapService {
 
     /**
      * 获取全部专题图
+     *
      * @return
      */
     @Override
@@ -37,6 +39,7 @@ public class ThematicMapServiceImpl implements ThematicMapService {
 
     /**
      * 删除专题图根据编号
+     *
      * @param id 编号
      * @return
      */
@@ -47,6 +50,7 @@ public class ThematicMapServiceImpl implements ThematicMapService {
 
     /**
      * 保存专题图
+     *
      * @param thematicMapDomain
      * @return
      */

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
  */

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
  */

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

@@ -12,7 +12,7 @@
 <!--    -->
 
     <select id="selectType" resultType="com.ruoyi.system.domain_yada.TypeTable">
-        SELECT  id,class1,percentage,china FROM  type_table
+        SELECT  id,class1,percentage,china,year1 FROM  type_table
     </select>
 
 
@@ -23,4 +23,8 @@
     <select id="selectCloumnar" resultType="com.ruoyi.system.domain_yada.CloumnarTable">
         SELECT  id,country,year,forestcover,china FROM  columnar_table
     </select>
+
+    <select id="selectConversion" resultType="com.ruoyi.system.domain_yada.TypeConversion">
+        SELECT  id,class1,increase,reduce FROM  type_conversion
+    </select>
 </mapper>