Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
#	ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
#	ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
#	ruoyi-ui/src/views/tool/swagger/index.vue

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

@@ -18,17 +18,9 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("   --->>>启动成功！<<<---");
+        System.out.println();
-//        System.out.println("(♥◠‿◠)ﾉﾞ    ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("                                                               --->>>启动成功！<<<---");
-//                " .-------.       ____     __        \n" +
+
-//                " |  _ _   \\      \\   \\   /  /    \n" +
-//                " | ( ' )  |       \\  _. /  '       \n" +
-//                " |(_ o _) /      _( )_ .'         \n" +
-//                " | (_,_).' __  ___(_ o _)'          \n" +
-//                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-//                " |  | \\ `'   /|   `-'  /           \n" +
-//                " |  |  \\    /  \\      /           \n" +
-//                " ''-'   `'-'    `-..-'              ");
     }
 
 }

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

@@ -47,9 +47,9 @@ public class AorestCoverageController {
      */
     @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法",httpMethod = "GET")
-    public AjaxResult selectAorestCoverage( @RequestBody AorestCoverageVO  coverageVO)
+    public AjaxResult selectAorestCoverage()
     {
-        List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage(coverageVO.getRegion(),coverageVO.getParticularYear());
+        List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage();
         return AjaxResult.success(eastVOSList);
     }
 

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

@@ -36,9 +36,9 @@ public class RegionVGIController
      */
     @RequestMapping(value = "/SelectRegion",method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法",httpMethod = "GET")
-    public AjaxResult SelectRegion(@RequestBody RegionVGIVO regionVGIVO)
+    public AjaxResult SelectRegion()
     {
-        List<RegionVGIVO> vgivost= regionVGIService.selectRegion(regionVGIVO.getTypeName(),regionVGIVO.getParticularYear());
+        List<RegionVGIVO> vgivost= regionVGIService.selectRegion();
         return AjaxResult.success(vgivost);
     }
 

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

@@ -9,16 +9,9 @@ import com.ruoyi.system.service_yada.IRegionalSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -38,9 +31,9 @@ public class RegionalSystemController {
      */
     @RequestMapping(value = "/selectRegional",method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法",httpMethod = "GET")
-    public AjaxResult selectRegional(@RequestBody RegionalSystemVO response)
+    public AjaxResult selectRegional(@RequestParam("region") String region)
     {
-        List<RegionalSystemVO> eastVOSList= systemService.selectRegional(response.getRegion(),response.getParticularYear());
+        List<RegionalSystemVO> eastVOSList= systemService.selectRegional(region);
         return AjaxResult.success(eastVOSList);
     }
 
@@ -52,7 +45,7 @@ public class RegionalSystemController {
     @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(@Param("ID") String ID)
+    public AjaxResult DelRegional(@RequestParam("ID") String ID)
     {
         int NUM = systemService.DelRegional(ID);
         if (NUM>0)

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

@@ -45,11 +45,11 @@ public class ThematicMapController {
             @ApiResponse(code =403,message = "权限不足"),
             @ApiResponse(code =404,message = "未找到")
     })
-    @RequestMapping(value = "/get/all",method = {RequestMethod.GET})
+    @RequestMapping(value = "/get/all",method = {RequestMethod.POST})
     public AjaxResult selectAllThematicMap(HttpServletResponse response,@RequestBody ThematicMapDomain thematicMapDomain)
     {
-        List<ThematicMapDomain> res= thematicMapService.selectAll(thematicMapDomain.getPictureTime(),
+        List<ThematicMapDomain> res= thematicMapService.selectAll(thematicMapDomain.getPictureType(),
-                thematicMapDomain.getPictureZh());
+                thematicMapDomain.getPictureTypeOne(),thematicMapDomain.getPictureTypeTwo());
         return AjaxResult.success(res);
     }
     /**

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

@@ -33,14 +33,13 @@ public class VegetationCoverageController {
 
     /**
      * 查询方法
-     * @param response 响应头
      * @return 参数类
      */
     @RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET})
     @ApiOperation(value = "查询方法",httpMethod = "GET")
-    public AjaxResult selectVegetation(HttpServletResponse response,@RequestBody VegetationCoverageVO coverageVO)
+    public AjaxResult selectVegetation()
     {
-        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation(coverageVO.getRegion(),coverageVO.getParticularYear());
+        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
         return AjaxResult.success(eastVOSList);
     }
 

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

@@ -13,8 +13,8 @@ import java.util.List;
  */
 public interface AorestCoverageMapper {
 
-    List<AorestCoverageVO> selectAorestCoverage(@Param("region") String region,
+    List<AorestCoverageVO> selectAorestCoverage(/*@Param("region") String region,
-                                                @Param("particularYear") String particularYear);
+                                                @Param("particularYear") String particularYear*/);
 
     Integer DelAorestCoverage(@Param("id") String id);
 

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

@@ -11,8 +11,8 @@ import java.util.List;
  */
 public interface RegionVGIMapper {
 
-    List<RegionVGIVO> selectRegion(@Param("typeName") String typeName,
+    List<RegionVGIVO> selectRegion(/*@Param("typeName") String typeName,
-                                   @Param("particularYear") String particularYear);
+                                   @Param("particularYear") String particularYear*/);
 
     Integer DelRegion(@Param("id") String id);
 

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

@@ -12,8 +12,7 @@ import java.util.List;
  */
 public interface RegionalSystemMapper {
 
-    List<RegionalSystemVO> selectRegional(@Param("region") String region,
+    List<RegionalSystemVO> selectRegional(@Param("region") String region);
-                                          @Param("particularYear") String particularYear);
 
     Integer DelRegional(@Param("id") String id);
 

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

@@ -17,8 +17,9 @@ public interface ThematicMapMapper {
      * 获取所有专题图
      * @return
      */
-    List<ThematicMapDomain> selectAllThematicMap(@Param("pictureTime") LocalDateTime pictureTime,
+    List<ThematicMapDomain> selectAllThematicMap(@Param("pictureType") String pictureType,
-                                                 @Param("pictureZh") String pictureZh);
+                                                 @Param("pictureTypeOne") String pictureTypeOne,
+                                                 @Param("pictureTypeTwo") String pictureTypeTwo);
 
     /**
      * 删除专题图根据编号

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

@@ -11,8 +11,8 @@ import java.util.List;
  */
 public interface VegetationCoverageMapper {
 
-    List<VegetationCoverageVO> selectVegetation(@Param("region") String region,
+    List<VegetationCoverageVO> selectVegetation(/*@Param("region") String region,
-                                                @Param("particularYear") String particularYear);
+                                                @Param("particularYear") String particularYear*/);
 
     Integer DelVegetation(@Param("id") String id);
 

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

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface IAorestCoverageService {
 
-    public List<AorestCoverageVO> selectAorestCoverage(String region,String particularYear);
+    public List<AorestCoverageVO> selectAorestCoverage(/*String region,String particularYear*/);
 
     public Integer DelAorestCoverage(String id);
 

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

@@ -15,7 +15,7 @@ public interface IRegionVGIService {
      * 查询
      * @return
      */
-    public List<RegionVGIVO> selectRegion(String typeName,String particularYear);
+    public List<RegionVGIVO> selectRegion(/*String typeName,String particularYear*/);
 
     /**
      * 删除

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IRegionalSystemService {
 
-    public List<RegionalSystemVO> selectRegional(String region,String particularYear);
+    public List<RegionalSystemVO> selectRegional(String region);
 
     public Integer DelRegional(@Param("id") String id);
 

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IVegetationCoverageService {
 
-    public List<VegetationCoverageVO> selectVegetation(String region,String particularYear);
+    public List<VegetationCoverageVO> selectVegetation(/*String region,String particularYear*/);
 
     public Integer DelVegetation(String id);
 

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

@@ -17,7 +17,7 @@ public interface ThematicMapService {
      * 获取全部专题图
      * @return
      */
-    List<ThematicMapDomain> selectAll(LocalDateTime pictureTime, String pictureZh);
+    List<ThematicMapDomain> selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo);
 
     /**
      * 删除专题图根据编号

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

@@ -26,8 +26,8 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService {
 
 
     @Override
-    public List<AorestCoverageVO> selectAorestCoverage(String region,String particularYear) {
+    public List<AorestCoverageVO> selectAorestCoverage(/*String region,String particularYear*/) {
-        return coverageMapper.selectAorestCoverage(region,particularYear);
+        return coverageMapper.selectAorestCoverage(/*region,particularYear*/);
     }
 
     @Override

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

@@ -22,8 +22,8 @@ public class RegionVGIServiceimpl implements IRegionVGIService {
     private RegionVGIMapper vgiMapper;
 
     @Override
-    public List<RegionVGIVO> selectRegion(String typeName,String particularYear) {
+    public List<RegionVGIVO> selectRegion(/*String typeName,String particularYear*/) {
-        return vgiMapper.selectRegion(typeName,particularYear);
+        return vgiMapper.selectRegion(/*typeName,particularYear*/);
     }
 
     @Override

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

@@ -25,8 +25,8 @@ public class RegionalSystemServiceimpl implements IRegionalSystemService {
 
 
     @Override
-    public List<RegionalSystemVO> selectRegional(String region,String particularYear) {
+    public List<RegionalSystemVO> selectRegional(String region) {
-        return Regional.selectRegional(region,particularYear);
+        return Regional.selectRegional(region);
     }
 
     @Override

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

@@ -25,8 +25,8 @@ public class ThematicMapServiceImpl implements ThematicMapService {
      * @return
      */
     @Override
-    public List<ThematicMapDomain> selectAll(LocalDateTime pictureTime,String pictureZh){
+    public List<ThematicMapDomain> selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo){
-        return thematicMapMapper.selectAllThematicMap(pictureTime,pictureZh);
+        return thematicMapMapper.selectAllThematicMap(pictureType,pictureTypeOne,pictureTypeTwo);
     }
 
     /**

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

@@ -26,8 +26,8 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService
 
 
     @Override
-    public List<VegetationCoverageVO> selectVegetation(String region,String particularYear) {
+    public List<VegetationCoverageVO> selectVegetation(/*String region,String particularYear*/) {
-        return coverageMapper.selectVegetation(region,particularYear);
+        return coverageMapper.selectVegetation(/*region,particularYear*/);
     }
 
     @Override

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

@@ -25,15 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAorestCoverage" resultMap="RM_AorestCoverage">
         SELECT  <include refid="columns"/>  FROM  forest_coverage
-    WHERE 1=1
+<!--    WHERE 1=1-->
-        <if test="particularYear!= null and particularYear !=''">
+<!--        <if test="particularYear!= null and particularYear !=''">-->
-        AND particular_year = #{particularYear}
+<!--        AND particular_year = #{particularYear}-->
-        </if>
+<!--        </if>-->
-        <if test="region!= null and region !=''">
+<!--        <if test="region!= null and region !=''">-->
-            AND region = #{typeName}
+<!--            AND region = #{typeName}-->
-        </if>
+<!--        </if>-->
-
-
     </select>
 
     <delete id="DelAorestCoverage">

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

@@ -26,13 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRegion" resultMap="RM_RegionVGI">
         SELECT  <include refid="columns"/>  FROM  region_vgi
-        WHERE 1=1
+        where particular_year='2020.0'
-        <if test="particularYear!= null and particularYear !=''">
+
-            AND particular_year = #{particularYear}
+<!--        WHERE 1=1-->
-        </if>
+<!--        <if test="particularYear!= null and particularYear !=''">-->
-        <if test="typeName!= null and typeName !=''">
+<!--            AND particular_year = #{particularYear}-->
-            AND type_name = #{typeName}
+<!--        </if>-->
-        </if>
+<!--        <if test="typeName!= null and typeName !=''">-->
+<!--            AND type_name = #{typeName}-->
+<!--        </if>-->
     </select>
 
     <delete id="DelRegion">

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

@@ -19,16 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="columns">
 	    <![CDATA[
-        id,region,region_en,type_conversion,type_conversion_en,proportion_of_changed_areas,particular_year,createBy,createTime
+        id,region,region_en,type_conversion,type_conversion_en,proportion_of_changed_areas,particular_year,created_by,created_time
         ]]>
 	</sql>
 
     <select id="selectRegional" resultMap="RM_Regional">
         SELECT  <include refid="columns"/>  FROM  proportion_of_ecosystem_type_transfer
         WHERE 1=1
-        <if test="particularYear!= null and particularYear !=''">
-            AND particular_year = #{particularYear}
-        </if>
         <if test="region!= null and region !=''">
             AND region = #{region}
         </if>

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

@@ -28,11 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAllThematicMap" resultMap="RM_ThematicMap">
         SELECT  <include refid="columns"/>  FROM thematic_map
         WHERE 1=1
-        <if test="pictureTime!= null and pictureTime !=''">
+        <if test="pictureType!= null and pictureType !=''">
-            AND picture_time = #{pictureTime}
+            AND picture_type = #{pictureType}
         </if>
-        <if test="pictureZh!= null and pictureZh !=''">
+        <if test="pictureTypeOne!= null and pictureTypeOne !=''">
-            AND picture_zh = #{pictureZh}
+            AND picture_type_one = #{pictureTypeOne}
+        </if>
+        <if test="pictureTypeTwo!= null and pictureTypeTwo !=''">
+            AND picture_type_two = #{pictureTypeTwo}
         </if>
     </select>
 

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

@@ -25,13 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectVegetation" resultMap="RM_Vegetation">
         SELECT  <include refid="columns"/>  FROM  fvc_npp
-        WHERE 1=1
+<!--        WHERE 1=1-->
-        <if test="particularYear!= null and particularYear !=''">
+<!--        <if test="particularYear!= null and particularYear !=''">-->
-            AND particular_year = #{particularYear}
+<!--            AND particular_year = #{particularYear}-->
-        </if>
+<!--        </if>-->
-        <if test="region != null and region !=''">
+<!--        <if test="region != null and region !=''">-->
-            AND region = #{region}
+<!--            AND region = #{region}-->
-        </if>
+<!--        </if>-->
     </select>
 
     <delete id="DelVegetation">

ruoyi-ui/src/views/tool/swagger/index.vue

@@ -1,3 +1,21 @@
+<<<<<<< HEAD
+<template>
+  <i-frame :src="url" />
+</template>
+<script>
+import iFrame from "@/components/iFrame/index";
+export default {
+  name: "Swagger",
+  components: { iFrame },
+  data() {
+    return {
+      // url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
+      url: process.env.VUE_APP_BASE_API + "/doc.html"
+    };
+  },
+};
+</script>
+=======
 <template>
   <i-frame :src="url" />
 </template>
@@ -14,3 +32,4 @@ export default {
   },
 };
 </script>
+>>>>>>> 43ee95a198fd259c420f6370f4035895bfd4af3c