测试提交

更新
修改
2022-08-16 08:48:40 +08:00 · 2022-08-16 08:36:53 +08:00 · 2022-07-14 15:00:55 +08:00 · 2022-07-12 16:31:23 +08:00 · 2022-07-08 14:46:17 +08:00 · 2022-07-01 16:10:17 +08:00
56 changed files with 1766 additions and 70 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@ -1,9 +1,16 @@
 package com.ruoyi;

+import com.sun.jna.platform.unix.solaris.LibKstat;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.util.ObjectUtils;
+
+import javax.print.attribute.standard.MediaSize;
+import java.time.Year;
+

 /**
 * 启动程序
@ -16,20 +23,12 @@ public class RuoYiApplication
 {
    public static void main(String[] args)
    {
+
        // System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(RuoYiApplication.class, args);
        System.out.println();
        System.out.println("                                                               --->>>启动成功！<<<---");
-//        System.out.println("(♥◠‿◠)ﾉﾞ    ლ(´ڡ`ლ)ﾞ  \n" +
-//                " .-------.       ____     __        \n" +
-//                " |  _ _   \\      \\   \\   /  /    \n" +
-//                " | ( ' )  |       \\  _. /  '       \n" +
-//                " |(_ o _) /      _( )_ .'         \n" +
-//                " | (_,_).' __  ___(_ o _)'          \n" +
-//                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-//                " |  | \\ `'   /|   `-'  /           \n" +
-//                " |  |  \\    /  \\      /           \n" +
-//                " ''-'   `'-'    `-..-'              ");
    }

+
 }
--- 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
@ -159,14 +159,22 @@ public class AorestCoverageController {
        return  upload;
    }

-    @RequestMapping(value = "/Dictionary")
-    @ApiOperation(value = "字典查询",httpMethod = "POST")
-     public  AjaxResult Dictionary(@RequestBody Dictionary dic)
+    @RequestMapping(value = "/dictionary",method = {RequestMethod.GET})
+//    @ApiOperation(value = "字典查询",httpMethod = "GET")
+     public  AjaxResult Dictionary(String type,String type1,String type2)
     {
-        List<Dictionary> diclist=service.selectDic(dic.getCodingType(),dic.getCodingType1(), dic.getCodingType2());
+        List<Dictionary> diclist=service.selectDic(type);
         return AjaxResult.success(diclist);
+
     }

+    @RequestMapping(value = "/selectNow",method = {RequestMethod.GET})
+    @ApiOperation(value = "字典查询",httpMethod = "GET")
+    public  AjaxResult selectNow(String type)
+    {
+        List<Dictionary> diclist=service.selectNow(type);
+        return AjaxResult.success(diclist);
+    }


 }
--- 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
@ -0,0 +1,46 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.CityVo;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import com.ruoyi.system.service_yada.ICityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 城市
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/City", produces = "application/json;charset=UTF-8")
+@Api(tags = "城市")
+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<CityVo> 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<OrientationVO> cityVos=cityService.selectOrientation(city,country);
+        return  AjaxResult.success(cityVos);
+    }
+}
--- 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
@ -0,0 +1,73 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.Server;
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import com.ruoyi.system.domain_yada.CityInformation;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import com.ruoyi.system.service_yada.ICityExpandService;
+import org.apache.ibatis.annotations.Param;
+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 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
+{
+    @Resource
+    private ICityExpandService service;
+
+    /**
+     * 获取城市扩张方位
+     * @param city
+     * @param year
+     * @return
+     */
+    @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET})
+    public AjaxResult selectCityExpand(String city,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)
+    {
+        List<OrientationVO> 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){
+//        if (city.equals("")&&country.equals(""))
+//        {
+//            List<CityInformation> value= service.selectMain(year);
+//            return AjaxResult.success(value);
+//        }
+        List<CityInformation> value= service.selectInfrom(city,country,year);
+        return AjaxResult.success(value);
+
+    }
+}
--- 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
@ -33,15 +33,14 @@ public class GlobalTypeController {

    /**
     * 查询方法
-     * @param response 响应头
-     * @param request 客户端请求
+
     * @return 参数类
     */
    @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST})
    @ApiOperation(value = "查询方法",httpMethod = "POST")
-    public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request,@RequestBody GlobalTypeVO TypeVO)
+      public AjaxResult selectGlobalType()
    {
-        List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType(TypeVO.getTypeName(),TypeVO.getParticularYear());
+        List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType();
        return AjaxResult.success(eastVOSList);
    }

--- 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
@ -76,11 +76,6 @@ public class SpecialController {
        map.put("output","json");
        String value= WeatherUtils.httpRequest(url,map);
        WeatherUtilsVO vo = JSON.parseObject(value,WeatherUtilsVO.class);
-//        String value2=vo.getForecasts().substring(1,vo.getForecasts().length()-1);
-//        System.out.println(value2);
-//        vo.setForecast(JSON.parseObject(value2,ForecastVo.class));
-//        JSONObject userJson=JSONObject.parseObject(value);
-//        WeatherUtilsVO utilsValue= JSON.toJavaObject(userJson,WeatherUtilsVO.class);

        return AjaxResult.success(vo);
    }    /**
--- 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
@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import com.ruoyi.system.service_yada.ISpecialReportService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.aspectj.weaver.loadtime.Aj;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 专题报告
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Special", produces = "application/json;charset=UTF-8")
+@Api(tags = "专题报告")
+public class SpecialReportController
+{
+
+    @Resource
+    private ISpecialReportService service;
+
+    @RequestMapping(value = "/getSpecial",method = {RequestMethod.GET})
+    @ApiOperation(value = "返回专题数据",httpMethod = "GET")
+    public AjaxResult getSpecial(String zone)
+    {
+        List<SpecialVO> value=service.selectSpecial(zone);
+
+        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 = "/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();
+
+    }
+
+    @RequestMapping(value = "/getUploadSpecial")
+    @ApiOperation(value = "返回专题通报")
+    public  AjaxResult getUploadSpecial(String fileName)
+    {
+        List<UploadSpecialVO> value=service.selectUploadSpecial(fileName);
+
+        return  AjaxResult.success(value);
+    }
+
+    @RequestMapping(value = "/getUploadStandard")
+    @ApiOperation(value = "返回专题规范")
+    public  AjaxResult getUploadStandard(String fileName)
+    {
+        List<UploadSpecialVO> value=service.selectUploadSpecial1(fileName);
+
+        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)
+        {
+            case "ch":
+                route="avatar/word/陆域中文1130.pdf";
+                break;
+            case "en":
+                route="avatar/word/陆域中文1130.pdf";
+                break;
+            default:
+                return  AjaxResult.error("未找到对应路径");
+        }
+        return  AjaxResult.success(route);
+    }
+}
--- 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
@ -4,6 +4,7 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.system.domain_yada.MapServicesVO;
 import com.ruoyi.system.domain_yada.ThematicMapDomain;
 import com.ruoyi.system.service_yada.ThematicMapService;
 import io.swagger.annotations.*;
@ -33,7 +34,7 @@ public class ThematicMapController {
    private ThematicMapService thematicMapService;

    /**
-     * 查询方法
+     * 查询专题图
     * @param response 响应头
     * @return 参数类
     */
@ -52,6 +53,29 @@ public class ThematicMapController {
                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 = "未找到")
+    })
+    @RequestMapping(value = "/get/map",method = {RequestMethod.GET})
+    public AjaxResult selectMap(HttpServletResponse response,
+                                String chartType,String chartName,String particularYear)
+    {
+        List<MapServicesVO> res= thematicMapService.selMapServers(chartName,chartType,particularYear);
+        return AjaxResult.success(res);
+    }
+
    /**
     * 删除方法
     * @param id id
--- 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
@ -37,9 +37,9 @@ public class VegetationCoverageController {
     */
    @RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET})
    @ApiOperation(value = "查询方法",httpMethod = "GET")
-    public AjaxResult selectVegetation()
+    public AjaxResult selectVegetation(String type)
    {
-        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
+        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation(type);
        return AjaxResult.success(eastVOSList);
    }

--- 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
@ -0,0 +1,33 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.Dictionary;
+import com.ruoyi.system.service_yada.IAorestCoverageService;
+import io.swagger.annotations.Api;
+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 java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/14 11:56
+ */
+@RestController
+@RequestMapping(value = "/dictionary", produces = "application/json;charset=UTF-8")
+public class dictionaryController
+{
+
+    @Resource
+    private IAorestCoverageService service;
+
+    @RequestMapping(value = "/select",method = {RequestMethod.GET})
+    public AjaxResult Dictionary(String type)
+    {
+        List<Dictionary> diclist=service.selectDic(type);
+        return AjaxResult.success(diclist);
+
+    }
+}
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@ -6,6 +6,7 @@ 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
                username: sjs
                password: song5325
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -9,7 +9,7 @@ ruoyi:
  # 实例演示开关
  demoEnabled: true
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: D:/ruoyi/uploadPath   #/home/sjs/ruoyi/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数组计算 char 字符验证
@ -134,3 +134,4 @@ xss:
  excludes: /system/notice/*
  # 匹配链接
  urlPatterns: /system/*,/monitor/*,/tool/*
+
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
    <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/home/sjs/ruoyi/logs/yada" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java
@ -18,7 +18,7 @@ public class WeatherUtils
        //buffer用于接受返回的字符
        StringBuffer buffer = new StringBuffer();
        try {
-            //建立URL，把请求地址给补全，其中urlencode（）方法用于把params里的参数给取出来
+            //拼接url连接
            URL url = new URL(requestUrl+"?"+urlencode(params));
            //打开http连接
            HttpURLConnection httpUrlConn = (HttpURLConnection) url.openConnection();
@ -40,7 +40,6 @@ public class WeatherUtils
            bufferedReader.close();
            inputStreamReader.close();
            inputStream.close();
-            inputStream = null;
            //断开连接
            httpUrlConn.disconnect();

--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                .antMatchers("/login", "/captcha/get", "/captcha/check").permitAll()
                .antMatchers("/*/api-docs").anonymous()
                .antMatchers("/druid/**").anonymous()
-                // 除上面外的所有请求全部需要鉴权认证
+//                // 除上面外的所有请求全部需要鉴权认证
                .anyRequest().authenticated()
                .and()
                .headers().frameOptions().disable();
--- 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
@ -0,0 +1,98 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/1 10:15
+ */
+public class CityFocusVO extends  SysBaseEntity
+{
+    private  String id;
+
+    private  String xAxis;
+
+    private  String yAxis;
+
+    private  String city;
+
+    private  String year;
+
+    private  String xAxisPy;
+
+    private  String yAxisPy;
+
+    private  String cityEn;
+
+    private  String country;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(String xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public String getyAxis() {
+        return yAxis;
+    }
+
+    public void setyAxis(String yAxis) {
+        this.yAxis = yAxis;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getxAxisPy() {
+        return xAxisPy;
+    }
+
+    public void setxAxisPy(String xAxisPy) {
+        this.xAxisPy = xAxisPy;
+    }
+
+    public String getyAxisPy() {
+        return yAxisPy;
+    }
+
+    public void setyAxisPy(String yAxisPy) {
+        this.yAxisPy = yAxisPy;
+    }
+
+    public String getCityEn() {
+        return cityEn;
+    }
+
+    public void setCityEn(String cityEn) {
+        this.cityEn = cityEn;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+}
--- 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
@ -0,0 +1,137 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/1 13:55
+ */
+public class CityInformation
+{
+    private  String id;
+
+    /**
+     * 城市
+     */
+    private  String city;
+    /**
+     * 面积
+     */
+    private String area;
+    /**
+     * 年份
+     */
+    private  String year;
+    /**
+     * 不透水面面积km
+     */
+    private  String imperviousSurfaceArea;
+    /**
+     * 不透水面覆盖率%
+     */
+    private String imperviousSurfaceCoverage;
+    /**
+     * 不透水面扩张速度km/y
+     */
+    private String speed;
+    /**
+     * 不透水面扩张强度%
+     */
+    private  String strength;
+    /**
+     * 不透水面扩张贡献度%
+     */
+    private  String contribution;
+    /**
+     * 所属国家
+     */
+    private  String superior;
+
+    private String  country;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getImperviousSurfaceArea() {
+        return imperviousSurfaceArea;
+    }
+
+    public void setImperviousSurfaceArea(String imperviousSurfaceArea) {
+        this.imperviousSurfaceArea = imperviousSurfaceArea;
+    }
+
+    public String getImperviousSurfaceCoverage() {
+        return imperviousSurfaceCoverage;
+    }
+
+    public void setImperviousSurfaceCoverage(String imperviousSurfaceCoverage) {
+        this.imperviousSurfaceCoverage = imperviousSurfaceCoverage;
+    }
+
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
+    public String getStrength() {
+        return strength;
+    }
+
+    public void setStrength(String strength) {
+        this.strength = strength;
+    }
+
+    public String getContribution() {
+        return contribution;
+    }
+
+    public void setContribution(String contribution) {
+        this.contribution = contribution;
+    }
+
+    public String getSuperior() {
+        return superior;
+    }
+
+    public void setSuperior(String superior) {
+        this.superior = superior;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+}
--- 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
@ -0,0 +1,110 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/24 9:51
+ */
+public class CityVo extends SysBaseEntity
+{
+    private  String id;
+
+    private  String city;
+
+    private  String area;
+
+    private  String year;
+
+    private  Double imperviousSurfaceArea;
+
+    private  Double imperviousSurfaceCoverage;
+
+    public Double getImperviousSurfaceExpansionSpeed() {
+        return imperviousSurfaceExpansionSpeed;
+    }
+
+    public void setImperviousSurfaceExpansionSpeed(Double imperviousSurfaceExpansionSpeed) {
+        this.imperviousSurfaceExpansionSpeed = imperviousSurfaceExpansionSpeed;
+    }
+
+    private  Double imperviousSurfaceExpansionSpeed;
+
+    private  Double imperviousSurfaceExpansionStrength;
+
+    private  Double imperviousSurfaceExpansionCntribution ;
+
+    private  String superior;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public Double getImperviousSurfaceArea() {
+        return imperviousSurfaceArea;
+    }
+
+    public void setImperviousSurfaceArea(Double imperviousSurfaceArea) {
+        this.imperviousSurfaceArea = imperviousSurfaceArea;
+    }
+
+    public Double getImperviousSurfaceCoverage() {
+        return imperviousSurfaceCoverage;
+    }
+
+    public void setImperviousSurfaceCoverage(Double imperviousSurfaceCoverage) {
+        this.imperviousSurfaceCoverage = imperviousSurfaceCoverage;
+    }
+
+    public Double getImperviousSurfaceExpansionStrength() {
+        return imperviousSurfaceExpansionStrength;
+    }
+
+    public void setImperviousSurfaceExpansionStrength(Double imperviousSurfaceExpansionStrength) {
+        this.imperviousSurfaceExpansionStrength = imperviousSurfaceExpansionStrength;
+    }
+
+    public Double getImperviousSurfaceExpansionCntribution() {
+        return imperviousSurfaceExpansionCntribution;
+    }
+
+    public void setImperviousSurfaceExpansionCntribution(Double imperviousSurfaceExpansionCntribution) {
+        this.imperviousSurfaceExpansionCntribution = imperviousSurfaceExpansionCntribution;
+    }
+
+    public String getSuperior() {
+        return superior;
+    }
+
+    public void setSuperior(String superior) {
+        this.superior = superior;
+    }
+}
--- 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
@ -17,6 +17,8 @@ public class GlobalTypeVO extends  SysBaseEntity {

    private  Double area;

+    private  Double areaChange;
+
    private  int  particularYear;

    public String getId() {
@ -66,4 +68,12 @@ public class GlobalTypeVO extends  SysBaseEntity {
    public void setParticularYear(int particularYear) {
        this.particularYear = particularYear;
    }
+
+    public Double getAreaChange() {
+        return areaChange;
+    }
+
+    public void setAreaChange(Double areaChange) {
+        this.areaChange = areaChange;
+    }
 }
--- 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
@ -0,0 +1,89 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 地图服务类
+ * @Author: JinSheng Song
+ * @Date: 2022/6/30 15:48
+ */
+public class MapServicesVO extends SysBaseEntity
+{
+    private  String id;
+    /**
+     * 地图类型
+     */
+    private  String chartType;
+    /**
+     * 地图名称
+     */
+    private  String chartName;
+    /**
+     * 图层
+     */
+    private  String layer;
+    /**
+     * 年份
+     */
+    private  String particularYear;
+    /**
+     * 分辨率
+     */
+    private  String resolvingPower;
+
+    private  String serviceType;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getChartType() {
+        return chartType;
+    }
+
+    public void setChartType(String chartType) {
+        this.chartType = chartType;
+    }
+
+    public String getChartName() {
+        return chartName;
+    }
+
+    public void setChartName(String chartName) {
+        this.chartName = chartName;
+    }
+
+    public String getLayer() {
+        return layer;
+    }
+
+    public void setLayer(String layer) {
+        this.layer = layer;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getResolvingPower() {
+        return resolvingPower;
+    }
+
+    public void setResolvingPower(String resolvingPower) {
+        this.resolvingPower = resolvingPower;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+}
--- 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
@ -0,0 +1,60 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/1 11:08
+ */
+public class Orientation extends SysBaseEntity{
+
+    private  String id;
+
+    private  String city;
+    /**
+     * 扩张方位
+     */
+    private  String position;
+
+    private  String areaValue;
+
+    private  String superior;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public String getAreaValue() {
+        return areaValue;
+    }
+
+    public void setAreaValue(String areaValue) {
+        this.areaValue = areaValue;
+    }
+
+    public String getSuperior() {
+        return superior;
+    }
+
+    public void setSuperior(String superior) {
+        this.superior = superior;
+    }
+}
--- 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
@ -0,0 +1,69 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/24 15:04
+ */
+public class OrientationVO extends SysBaseEntity
+{
+    private  String id;
+
+    private  String city;
+
+    private  String position;
+
+    private Double areaValue;
+
+    private  String superior;
+
+
+    private  String country;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public Double getAreaValue() {
+        return areaValue;
+    }
+
+    public void setAreaValue(Double areaValue) {
+        this.areaValue = areaValue;
+    }
+
+    public String getSuperior() {
+        return superior;
+    }
+
+    public void setSuperior(String superior) {
+        this.superior = superior;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+}
--- 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
@ -0,0 +1,78 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/20 11:48
+ */
+public class SpecialVO extends SysBaseEntity
+{
+    private  String id;
+
+    private  String fileName;
+
+    private  String dateTime;
+
+    private  String spaceDistinguish;
+
+    private  String timeDistinguish;
+
+    private  String zone;
+
+    private  String filePath;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(String dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getSpaceDistinguish() {
+        return spaceDistinguish;
+    }
+
+    public void setSpaceDistinguish(String spaceDistinguish) {
+        this.spaceDistinguish = spaceDistinguish;
+    }
+
+    public String getTimeDistinguish() {
+        return timeDistinguish;
+    }
+
+    public void setTimeDistinguish(String timeDistinguish) {
+        this.timeDistinguish = timeDistinguish;
+    }
+
+    public String getZone() {
+        return zone;
+    }
+
+    public void setZone(String zone) {
+        this.zone = zone;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+}
--- 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
@ -33,6 +33,8 @@ public class ThematicMapDomain extends SysBaseEntity {

    private String createdBy;

+    private  String year;
+
    private LocalDateTime createdTime;

    public String getPictureCode() {
@ -155,4 +157,12 @@ public class ThematicMapDomain extends SysBaseEntity {
                ", createdTime=" + createdTime +
                '}';
    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
 }
--- 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
@ -0,0 +1,92 @@
+package com.ruoyi.system.domain_yada;
+
+import javax.xml.stream.events.DTD;
+import java.awt.*;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/20 16:47
+ */
+public class UploadSpecialVO extends SysBaseEntity
+{
+
+    private  String id;
+
+    private  String fileName;
+
+    private String uploadNum;
+
+    private String filePath;
+
+    private String type;
+
+    private  String remarks1;
+
+    private  String remarks2;
+
+    private  String sign;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getUploadNum() {
+        return uploadNum;
+    }
+
+    public void setUploadNum(String uploadNum) {
+        this.uploadNum = uploadNum;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getRemarks1() {
+        return remarks1;
+    }
+
+    public void setRemarks1(String remarks1) {
+        this.remarks1 = remarks1;
+    }
+
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+}
--- 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
@ -24,6 +24,7 @@ public interface AorestCoverageMapper {

    List<UploadFile> selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName);

-    List<Dictionary> selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1,
-                               @Param("codingType2") String codingType2);
+    List<Dictionary> selectDic(@Param("codingType") String codingType);
+
+    List<Dictionary> selectNow(@Param("codingType2") String codingType2);
 }
--- 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
@ -0,0 +1,28 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import com.ruoyi.system.domain_yada.CityInformation;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/1 10:12
+ */
+public interface CityExpandMapper {
+
+    List<CityFocusVO> selectExpand(@Param("city") String city,
+                                              @Param("country") String country,
+                                              @Param("year") String year);
+
+    List<OrientationVO> selectOrientation( @Param("city") String city,
+                                           @Param("superior") String superior,
+                                           @Param("country") String country);
+
+    List<CityInformation> selectInfrom(@Param("city") String city,
+                                       @Param("country") String country,
+                                       @Param("year") String year);
+    List<CityInformation> selectMain( @Param("year") String year);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java
@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+
+import com.ruoyi.system.domain_yada.CityVo;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/24 10:06
+ */
+public interface CityMapper {
+
+    List<CityVo> selectCity(@Param("city") String city, @Param("gj") String gj);
+
+    List<OrientationVO> selectOrientation(@Param("city") String city, @Param("gj") String gj);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java
@ -11,7 +11,7 @@ import java.util.List;
 */
 public interface GlobalTypeMapper {

-    List<GlobalTypeVO> selectGlobalType(@Param("typeName") String typeName, @Param("particularYear") Integer particularYear);
+    List<GlobalTypeVO> selectGlobalType(/*@Param("typeName") String typeName, @Param("particularYear") Integer particularYear*/);

    Integer DelGlobalType(@Param("id") String id);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
@ -0,0 +1,28 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/20 11:54
+ */
+public interface SpecialReportMapper {
+
+  List<SpecialVO> selectSpecial(@Param("zone") String zone);
+
+  List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName);
+
+  List<UploadSpecialVO> selectUploadSpecial1(@Param("fileName") String fileName);
+
+  Integer updateUploadSpecial(@Param("id") Integer id);
+
+  Integer IntoUploadSpecial(UploadSpecialVO specialVO);
+
+  Integer DelSpecial(@Param("id") Integer id);
+
+  Integer IntoSpecial(SpecialVO specialVO);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
@ -1,8 +1,10 @@
 package com.ruoyi.system.mapper_yada;

+import com.ruoyi.system.domain_yada.MapServicesVO;
 import com.ruoyi.system.domain_yada.ThematicMapDomain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.stereotype.Repository;

 import java.time.LocalDateTime;
@ -21,6 +23,16 @@ public interface ThematicMapMapper {
                                                 @Param("pictureTypeOne") String pictureTypeOne,
                                                 @Param("pictureTypeTwo") String pictureTypeTwo);

+    /**
+     * 查看地图服务
+     * @param chartName 服务名称
+     * @param chartType 服务类型
+     * @return
+     */
+    List<MapServicesVO> selMapServers(@Param("chartName") String chartName,
+                                      @Param("chartType") String chartType,
+                                      @Param("particularYear") String particularYear);
+
    /**
     * 删除专题图根据编号
     * @param id 编号
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
@ -11,8 +11,7 @@ import java.util.List;
 */
 public interface VegetationCoverageMapper {

-    List<VegetationCoverageVO> selectVegetation(/*@Param("region") String region,
-                                                @Param("particularYear") String particularYear*/);
+    List<VegetationCoverageVO> selectVegetation(@Param("type") String type);

    Integer DelVegetation(@Param("id") String id);

--- 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
@ -26,6 +26,6 @@ public interface IAorestCoverageService {

    public List<UploadFile> selectUpload(String fileId,String fileName);

-    List<Dictionary> selectDic(String codingType,String codingType1,
-                                String codingType2);
+    List<Dictionary> selectDic(String codingType);
+    List<Dictionary> selectNow(String codingType2);
 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java
@ -0,0 +1,23 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import com.ruoyi.system.domain_yada.CityInformation;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/1 10:11
+ */
+public interface ICityExpandService {
+
+    List<CityFocusVO> selectExpand(String city,String country,String year);
+
+    List<OrientationVO> selectOrientation(String city, String superior,String country);
+
+    List<CityInformation> selectInfrom(String city, String country,String year);
+
+    List<CityInformation> selectMain(String year);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java
@ -0,0 +1,19 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.CityVo;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/24 10:11
+ */
+public interface ICityService {
+
+    List<CityVo> selectCity(String city, String gj);
+
+
+    List<OrientationVO> selectOrientation(String city, String gj);
+}
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java
@ -13,7 +13,7 @@ import java.util.List;
 */
 public interface IGlobalTypeService {

-   public List<GlobalTypeVO> selectGlobalType(String typeName,  Integer particularYear);
+   public List<GlobalTypeVO> selectGlobalType(/*String typeName,  Integer particularYear*/);

   public   Integer DelGlobalType(String id);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
@ -1,9 +1,29 @@
 package com.ruoyi.system.service_yada;

+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
 * 专题报告
 * @Author: JinSheng Song
 * @Date: 2022/5/11 11:39
 */
 public interface ISpecialReportService {
+
+    List<SpecialVO> selectSpecial(String zone);
+
+    List<UploadSpecialVO> selectUploadSpecial(String fileName);
+
+    List<UploadSpecialVO> selectUploadSpecial1(String fileName);
+
+    Integer updateUploadSpecial( Integer id);
+
+    Integer IntoUploadSpecial(UploadSpecialVO specialVO);
+
+    Integer DelSpecial( Integer id);
+
+    Integer IntoSpecial(SpecialVO specialVO);
 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
@ -13,7 +13,7 @@ import java.util.List;
 */
 public interface IVegetationCoverageService {

-    public List<VegetationCoverageVO> selectVegetation(/*String region,String particularYear*/);
+    public List<VegetationCoverageVO> selectVegetation(String type);

    public Integer DelVegetation(String id);

--- 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
@ -1,6 +1,8 @@
 package com.ruoyi.system.service_yada;

+import com.ruoyi.system.domain_yada.MapServicesVO;
 import com.ruoyi.system.domain_yada.ThematicMapDomain;
+import org.apache.ibatis.annotations.Param;

 import java.time.LocalDateTime;
 import java.util.List;
@ -19,6 +21,14 @@ public interface ThematicMapService {
     */
    List<ThematicMapDomain> selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo);

+    /**
+     * 获取地图服务
+     * @param chartName
+     * @param chartType
+     * @return
+     */
+    List<MapServicesVO> selMapServers(String chartName, String chartType,String particularYear);
+
    /**
     * 删除专题图根据编号
     * @param id 编号
--- 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
@ -51,8 +51,12 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService {
    }

    @Override
-    public List<Dictionary> selectDic(String codingType,String codingType1,
-                                      String codingType2) {
-        return  coverageMapper.selectDic(codingType,codingType1,codingType2);
+    public List<Dictionary> selectDic(String codingType) {
+        return  coverageMapper.selectDic(codingType);
+    }
+
+    @Override
+    public List<Dictionary> selectNow(String codingType2) {
+        return  coverageMapper.selectNow(codingType2);
    }
 }
--- 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
@ -0,0 +1,46 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.CityFocusVO;
+import com.ruoyi.system.domain_yada.CityInformation;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.CityExpandMapper;
+import com.ruoyi.system.service_yada.ICityExpandService;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.time.Year;
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/7/1 10:12
+ */
+@Service
+public class CityExpandServiceimpl implements ICityExpandService {
+
+
+    @Resource
+    private CityExpandMapper mapper;
+
+    @Override
+    public List<CityFocusVO> selectExpand(String city, String country, String year) {
+        return mapper.selectExpand(city,country,year);
+    }
+
+    @Override
+    public List<OrientationVO> selectOrientation(String city, String superior,String country) {
+        return  mapper.selectOrientation(city,superior,country);
+    }
+
+    @Override
+    public List<CityInformation> selectInfrom(String city, String country,String year) {
+        return mapper.selectInfrom(city,country,year);
+    }
+
+    @Override
+    public List<CityInformation> selectMain(String year) {
+        return mapper.selectMain(year);
+    }
+}
--- 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
@ -0,0 +1,31 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.CityVo;
+import com.ruoyi.system.domain_yada.OrientationVO;
+import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
+import com.ruoyi.system.mapper_yada.CityMapper;
+import com.ruoyi.system.service_yada.ICityService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/6/24 10:12
+ */
+@Service
+public class CityServiceimpl implements ICityService {
+
+    @Resource
+    private CityMapper cityMapper;
+    @Override
+    public List<CityVo> selectCity(String city, String gj) {
+        return cityMapper.selectCity(city,gj);
+    }
+
+    @Override
+    public List<OrientationVO> selectOrientation(String city, String gj) {
+        return cityMapper.selectOrientation(city,gj);
+    }
+}
--- 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
@ -26,8 +26,8 @@ public class GlobalTypeServiceimpl implements IGlobalTypeService {


    @Override
-    public List<GlobalTypeVO> selectGlobalType(String typeName,  Integer particularYear) {
-        return typeMapper.selectGlobalType(typeName, particularYear);
+    public List<GlobalTypeVO> selectGlobalType(/*String typeName,  Integer particularYear*/) {
+        return typeMapper.selectGlobalType(/*typeName, particularYear*/);
    }

    @Override
--- 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
@ -1,12 +1,57 @@
 package com.ruoyi.system.service_yada.impl;

+import com.ruoyi.system.domain_yada.SpecialVO;
+import com.ruoyi.system.domain_yada.UploadSpecialVO;
+import com.ruoyi.system.mapper_yada.SpecialReportMapper;
 import com.ruoyi.system.service_yada.ISpecialReportService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;

 /**
 * 专题报告
 * @Author: JinSheng Song
 * @Date: 2022/5/11 11:48
 */
+@Service
 public class SpecialReportServiceimpl  implements ISpecialReportService {

+    @Resource
+    private SpecialReportMapper mapper;
+
+    @Override
+    public List<SpecialVO> selectSpecial(String zone) {
+        return mapper.selectSpecial(zone);
+    }
+
+    @Override
+    public List<UploadSpecialVO> selectUploadSpecial(String fileName) {
+        return mapper.selectUploadSpecial(fileName);
+    }
+
+    @Override
+    public List<UploadSpecialVO> selectUploadSpecial1(String fileName) {
+        return  mapper.selectUploadSpecial1(fileName);
+    }
+
+    @Override
+    public Integer updateUploadSpecial(Integer id) {
+        return mapper.updateUploadSpecial(id);
+    }
+
+    @Override
+    public Integer IntoUploadSpecial(UploadSpecialVO specialVO) {
+        return mapper.IntoUploadSpecial(specialVO);
+    }
+
+    @Override
+    public Integer DelSpecial(Integer id) {
+        return mapper.DelSpecial(id);
+    }
+
+    @Override
+    public Integer IntoSpecial(SpecialVO specialVO) {
+        return mapper.IntoSpecial(specialVO);
+    }
 }
--- 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
@ -1,5 +1,6 @@
 package com.ruoyi.system.service_yada.impl;

+import com.ruoyi.system.domain_yada.MapServicesVO;
 import com.ruoyi.system.domain_yada.ThematicMapDomain;
 import com.ruoyi.system.mapper_yada.ThematicMapMapper;
 import com.ruoyi.system.service_yada.ThematicMapService;
@ -29,6 +30,11 @@ public class ThematicMapServiceImpl implements ThematicMapService {
        return thematicMapMapper.selectAllThematicMap(pictureType,pictureTypeOne,pictureTypeTwo);
    }

+    @Override
+    public List<MapServicesVO> selMapServers(String chartName, String chartType,String particularYear) {
+        return thematicMapMapper.selMapServers(chartName,chartType,particularYear);
+    }
+
    /**
     * 删除专题图根据编号
     * @param id 编号
--- 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
@ -26,8 +26,8 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService


    @Override
-    public List<VegetationCoverageVO> selectVegetation(/*String region,String particularYear*/) {
-        return coverageMapper.selectVegetation(/*region,particularYear*/);
+    public List<VegetationCoverageVO> selectVegetation(String type) {
+        return coverageMapper.selectVegetation(type);
    }

    @Override
--- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
@ -125,22 +125,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        ]]>
 	</sql>

+
    <select id="selectDic" resultMap="RM_Dictionary">
        select <include refid="columnsdic"/> from dictionary
-        where dictionary in
-              (SELECT A.dictionary FROM dictionary a
-               join (select dictionary from dictionary
-               where 1=1
-                <if test="codingType!= null and codingType !=''">
-                    AND coding_type = #{codingType}
-                </if>
-                <if test="codingType1!= null and codingType1 !=''">
-                    AND dictionary = #{codingType1}
-                </if>
-                   ) b on a.coding_type=b.dictionary
-                <if test="codingType2!= null and codingType2 !=''">
-                    AND a.dictionary = #{codingType2}
-                </if>
-                          )
+        where 1=1
+        <if test="codingType!= null and codingType !=''">
+            AND coding_type = #{codingType}
+        </if>
+
+    </select>
+
+<!--    <select id="selectDic" resultMap="RM_Dictionary">-->
+<!--        select <include refid="columnsdic"/> from dictionary-->
+<!--        where dictionary in-->
+<!--              (SELECT A.dictionary FROM dictionary a-->
+<!--               join (select dictionary from dictionary-->
+<!--               where 1=1-->
+<!--                <if test="codingType!= null and codingType !=''">-->
+<!--                    AND coding_type = #{codingType}-->
+<!--                </if>-->
+<!--                <if test="codingType1!= null and codingType1 !=''">-->
+<!--                    AND dictionary = #{codingType1}-->
+<!--                </if>-->
+<!--                   ) b on a.coding_type=b.dictionary-->
+<!--                <if test="codingType2!= null and codingType2 !=''">-->
+<!--                    AND a.dictionary = #{codingType2}-->
+<!--                </if>-->
+<!--                          )-->
+<!--    </select>-->
+
+
+    <select id="selectNow" resultMap="RM_Dictionary">
+        select <include refid="columnsdic"/> from dictionary
+        where coding_type =#{codingType2};
    </select>
 </mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.CityExpandMapper">
+
+    <resultMap id="RM_Orientation" type="com.ruoyi.system.domain_yada.OrientationVO">
+        <result property="id" column="id"/>
+        <result property="position" column="position"/>
+        <result property="city" column="city"/>
+        <result property="areaValue" column="area_value"/>
+        <result property="superior" column="superior"/>
+        <result property="country" column="country"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns_ore">
+	    <![CDATA[
+        id,position,city,area_value,superior,created_by,created_time,country
+        ]]>
+	</sql>
+
+    <select id="selectOrientation" resultMap="RM_Orientation">
+        SELECT  <include refid="columns_ore"/>  FROM  extension_orientation
+        where 1=1
+        <if test="city!= null and city !=''">
+            AND city = #{city}
+        </if>
+        <if test="superior!= null and superior !=''">
+            AND superior = #{superior}
+        </if>
+        <if test="country!= null and country !=''">
+            AND country = #{country}
+        </if>
+    </select>
+
+    <resultMap id="RM_Expand" type="com.ruoyi.system.domain_yada.CityFocusVO">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="city" column="city"/>
+        <result property="xAxis" column="x_axis"/>
+        <result property="yAxis" column="y_axis"/>
+        <result property="xAxisPy" column="x_axis_py"/>
+        <result property="yAxisPy" column="y_axis_py"/>
+        <result property="cityEn" column="city_en"/>
+        <result property="country" column="country"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
+        ]]>
+	</sql>
+
+    <select id="selectExpand" resultMap="RM_Expand">
+        SELECT  <include refid="columns"/>  FROM  urban_center_of_gravity
+        where 1=1
+        <if test="city!= null and city !=''">
+            AND city = #{city}
+        </if>
+        <if test="country!= null and country !=''">
+            AND country = #{country}
+        </if>
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
+    </select>
+
+    <resultMap id="RM_Inform" type="com.ruoyi.system.domain_yada.CityInformation">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="city" column="city"/>
+        <result property="area" column="area"/>
+        <result property="imperviousSurfaceArea" column="impervious_surface_area"/>
+        <result property="imperviousSurfaceCoverage" column="impervious_surface_coverage"/>
+        <result property="speed" column="speed"/>
+        <result property="strength" column="strength"/>
+        <result property="contribution" column="contribution"/>
+        <result property="superior" column="superior"/>
+        <result property="country" column="country"/>
+    </resultMap>
+
+    <sql id="columns_Infrom">
+	    <![CDATA[
+        id,year,city,area,impervious_surface_area,impervious_surface_coverage,speed,strength,contribution,superior,country
+        ]]>
+	</sql>
+
+    <select id="selectInfrom" resultMap="RM_Inform">
+        SELECT  <include refid="columns_Infrom"/>  FROM  urban_impervious_surface
+        where 1=1
+        <if test="city!= null and city !=''">
+            AND city = #{city}
+        </if>
+        <if test="country!= null and country !=''">
+            AND country = #{country}
+        </if>
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
+
+    </select>
+    <select id="selectMain" resultMap="RM_Inform">
+        SELECT  <include refid="columns_Infrom"/>  FROM  urban_impervious_surface
+        where country='澜湄流域'
+        <if test="year!= null and year !=''">
+            AND year = #{year}
+        </if>
+
+    </select>
+
+</mapper>
--- a/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml
@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.CityMapper">
+
+    <resultMap id="RM_City" type="com.ruoyi.system.domain_yada.CityVo">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="city" column="city"/>
+        <result property="area" column="area"/>
+        <result property="imperviousSurfaceArea" column="Impervious_surface_area"/>
+        <result property="imperviousSurfaceCoverage" column="Impervious_surface_coverage"/>
+        <result property="imperviousSurfaceExpansionSpeed" column="speed"/>
+        <result property="imperviousSurfaceExpansionStrength" column="strength"/>
+        <result property="imperviousSurfaceExpansionCntribution" column="contribution"/>
+        <result property="superior" column="superior"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,year,city,area,Impervious_surface_area,Impervious_surface_coverage,speed,strength,contribution,superior
+        ]]>
+	</sql>
+
+    <select id="selectCity" resultMap="RM_City">
+        SELECT  <include refid="columns"/>  FROM  urban_impervious_surface
+        where 1=1
+        <if test="city!= null and city !=''">
+            AND city = #{city}
+        </if>
+        <if test="gj!= null and gj !=''">
+            AND superior = #{gj}
+        </if>
+    </select>
+
+    <resultMap id="RM_Orientation" type="com.ruoyi.system.domain_yada.OrientationVO">
+        <result property="id" column="id"/>
+        <result property="city" column="city"/>
+        <result property="position" column="position"/>
+        <result property="areaValue" column="area_Value"/>
+        <result property="superior" column="superior"/>
+        <result property="country" column="country"/>
+        <result property="createTime" column="created_Time"/>
+        <result property="createBy" column="created_By"/>
+    </resultMap>
+    <sql id="columns1">
+	    <![CDATA[
+        id,city,superior,area_Value,position,created_Time,created_By,country
+        ]]>
+	</sql>
+
+
+    <select id="selectOrientation" resultMap="RM_Orientation">
+        SELECT  <include refid="columns1"/>  FROM  extension_orientation
+        where 1=1
+        <if test="city!= null and city !=''">
+            AND city = #{city}
+        </if>
+        <if test="gj!= null and gj !=''">
+            AND country = #{gj}
+        </if>
+    </select>
+
+
+</mapper>
--- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="typeNameEn" column="type_name_en"/>
        <result property="areaProportion" column="area_proportion"/>
        <result property="area" column="area"/>
+        <result property="areaChange" column="area_change"/>
        <result property="createBy" column="created_by"/>
        <result property="createTime" column="created_time"/>
    </resultMap>

    <sql id="columns">
 	    <![CDATA[
-        id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time
+        id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time,area_change
        ]]>
 	</sql>
    <select id="selectGlobalType" resultMap="RM_GlobalType">
--- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectRegion" resultMap="RM_RegionVGI">
        SELECT  <include refid="columns"/>  FROM  region_vgi
-        where particular_year='2020.0'
+--         where particular_year='2020'

 <!--        WHERE 1=1-->
 <!--        <if test="particularYear!= null and particularYear !=''">-->
--- a/ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.SpecialReportMapper">
+
+    <resultMap id="RM_Special" type="com.ruoyi.system.domain_yada.SpecialVO">
+        <result property="id" column="id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="dateTime" column="date_time"/>
+        <result property="spaceDistinguish" column="space_distinguish"/>
+        <result property="timeDistinguish" column="time_distinguish"/>
+        <result property="zone" column="zone"/>
+        <result property="filePath" column="file_path"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <resultMap id="RM_Upload" type="com.ruoyi.system.domain_yada.UploadSpecialVO">
+        <result property="id" column="id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="uploadNum" column="upload_num"/>
+        <result property="filePath" column="file_path"/>
+        <result property="remarks1" column="remarks1"/>
+        <result property="sign" column="sign"/>
+        <result property="remarks2" column="remarks2"/>
+        <result property="type" column="type"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,file_name,file_path,date_time,space_distinguish,time_distinguish,zone,created_by,created_time
+        ]]>
+	</sql>
+
+    <sql id="Upload">
+	    <![CDATA[
+        id,file_name,upload_num,file_path,remarks1,remarks2,type,created_by,created_time,sign
+        ]]>
+	</sql>
+
+    <select id="selectSpecial" resultMap="RM_Special">
+        SELECT  <include refid="columns"/>  FROM  special_table
+            WHERE 1=1
+            <if test="zone!= null and zone !=''">
+            AND zone = #{zone}
+            </if>
+    </select>
+
+    <select id="selectUploadSpecial" resultMap="RM_Upload">
+        SELECT  <include refid="Upload"/>  FROM  upload_special
+        WHERE type='1'
+        <if test="fileName!= null and fileName !=''">
+            AND file_name = #{fileName}
+        </if>
+    </select>
+
+    <select id="selectUploadSpecial1" resultMap="RM_Upload">
+        SELECT  <include refid="Upload"/>  FROM  upload_special
+        WHERE type='2'
+        <if test="fileName!= null and fileName !=''">
+            AND file_name = #{fileName}
+        </if>
+    </select>
+
+    <delete id="DelSpecial">
+        DELETE FROM special_table
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoSpecial">
+        <![CDATA[
+        INSERT INTO special_table (
+            file_name ,
+            date_time ,
+            space_distinguish ,
+            time_distinguish ,
+            zone ,
+            created_by,
+            created_time
+        ) VALUES (
+                     #{fileName,jdbcType=VARCHAR},
+                     #{dateTime,jdbcType=VARCHAR},
+                     #{spaceDistinguish,jdbcType=VARCHAR},
+                     #{timeDistinguish,jdbcType=DOUBLE},
+                     #{zone,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                    #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+
+
+
+
+
+    <update id="updateUploadSpecial">
+        update  upload_special set upload_num=upload_num+1
+            where id=#{id}
+    </update>
+
+    <insert id="IntoUploadSpecial">
+    <![CDATA[
+        INSERT INTO upload_special (
+            file_name ,
+            upload_num ,
+            file_path ,
+            remarks1 ,
+            remarks2 ,
+            type,
+            created_by,
+            created_time
+        ) VALUES (
+                     #{fileName,jdbcType=VARCHAR},
+                     #{uploadNum,jdbcType=INTEGER},
+                     #{filePath,jdbcType=VARCHAR},
+                     #{remarks1,jdbcType=VARCHAR},
+                     #{remarks2,jdbcType=VARCHAR},
+                     #{type,jdbcType=VARCHAR},
+                     #{createBy,jdbcType=VARCHAR},
+                    #{createTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+</mapper> 
--- a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
@ -15,15 +15,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="pictureTime" column="picture_time"/>
        <result property="picturePath" column="picture_path"/>
        <result property="remarks" column="remarks"/>
+        <result property="year" column="year"/>
        <result property="createdBy" column="created_by"/>
        <result property="createdTime" column="created_time"/>
    </resultMap>
+    <resultMap id="RM_MapServices" type="com.ruoyi.system.domain_yada.MapServicesVO">
+        <result property="id" column="id"/>
+        <result property="chartName" column="chart_name"/>
+        <result property="chartType" column="chart_type"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="layer" column="layer"/>
+        <result property="resolvingPower" column="resolving_power"/>
+        <result property="serviceType" column="service_type"/>
+    </resultMap>

    <sql id="columns">
 	    <![CDATA[
-        id,picture_zh,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
+        id,picture_zh,year,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
        ]]>
 	</sql>
+    <sql id="cloumns_Map">
+	    <![CDATA[
+        id,chart_name,chart_type,particular_year,layer,resolving_power,service_type
+        ]]>
+	</sql>
+
+
+    <select id="selMapServers" resultMap="RM_MapServices">
+        SELECT  <include refid="cloumns_Map"/>  FROM map_Services
+        WHERE 1=1
+        <if test="chartType!= null and chartType !=''">
+            AND chart_Type = #{chartType}
+        </if>
+        <if test="chartName!= null and chartName !=''">
+            AND chart_name = #{chartName}
+        </if>
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+    </select>

    <select id="selectAllThematicMap" resultMap="RM_ThematicMap">
        SELECT  <include refid="columns"/>  FROM thematic_map
--- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
@ -25,10 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectVegetation" resultMap="RM_Vegetation">
        SELECT  <include refid="columns"/>  FROM  fvc_npp
-<!--        WHERE 1=1-->
-<!--        <if test="particularYear!= null and particularYear !=''">-->
-<!--            AND particular_year = #{particularYear}-->
-<!--        </if>-->
+        WHERE 1=1
+        <if test="type!= null and type !=''">
+            AND type = #{type}
+        </if>
 <!--        <if test="region != null and region !=''">-->
 <!--            AND region = #{region}-->
 <!--        </if>-->
--- a/ruoyi-ui/src/views/tool/swagger/index.vue
+++ b/ruoyi-ui/src/views/tool/swagger/index.vue
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <template>
  <i-frame :src="url" />
 </template>
@ -14,3 +15,21 @@ export default {
  },
 };
 </script>
+=======
+<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>
+>>>>>>> 43ee95a198fd259c420f6370f4035895bfd4af3c
Author	SHA1	Message	Date
liuchengqian	9b61e16fdd	测试提交	2022-08-16 08:48:40 +08:00
songjinsheng	854afa033d	更新	2022-08-16 08:36:53 +08:00
songjinsheng	52095ccd04	修改	2022-07-14 15:00:55 +08:00
songjinsheng	e348a10862	不透水面修改	2022-07-12 16:31:23 +08:00
songjinsheng	2a64885193	修改参数	2022-07-08 14:46:17 +08:00
songjinsheng	7943dd8156	no message	2022-07-01 16:10:17 +08:00
songjinsheng	b94ce7f31b	新增1不透水面信息，扩张方位	2022-07-01 14:26:04 +08:00
songjinsheng	9665ec2690	no message	2022-07-01 11:05:07 +08:00
songjinsheng	9c144e2138	新增城市模块	2022-07-01 11:04:45 +08:00
songjinsheng	b8d90525ae	地图服务	2022-06-30 16:06:16 +08:00
songjinsheng	b51521dac7	修改mapper	2022-06-28 11:58:12 +08:00
songjinsheng	0719379052	配置bean	2022-06-24 10:40:21 +08:00
songjinsheng	f52a876226	修改控制器及新增城市功能	2022-06-24 10:28:33 +08:00
songjinsheng	11b8a3db44	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	2022-06-22 15:53:36 +08:00
songjinsheng	43ee95a198	修改查询方法，增加查询条件	2022-06-20 17:06:48 +08:00
qdxkrs	7c5e92246f	升级依赖包	2022-06-16 14:13:41 +08:00
songjinsheng	fafe483b53	修改bug	2022-06-16 11:58:56 +08:00
qdxkrs	6148ca9ae8	修改滑动验证码	2022-06-16 10:50:51 +08:00
songjinsheng	3006b3c751	增加redis密码	2022-06-16 09:49:49 +08:00
songjinsheng	e9e8ea36b7	验证码修改	2022-06-16 09:49:27 +08:00
songjinsheng	c9ee01dd1f	验证码	2022-06-16 09:24:27 +08:00
songjinsheng	2de946adb8	增加各个数据表数据上床功能，切换数据库	2022-06-08 17:18:59 +08:00
songjinsheng	a4976eff13	修改字典和token过期时间	2022-05-31 10:47:05 +08:00
songjinsheng	bd12230d7e	修改token过期时间	2022-05-30 10:17:07 +08:00
songjinsheng	42e4acf3dd	新增字典功能	2022-05-30 10:11:39 +08:00
qdxkrs	498a502c02	添加swagger 新界面	2022-05-24 12:01:43 +08:00
songjinsheng	5c0a93f679	Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev	2022-05-24 11:29:25 +08:00
songjinsheng	264a5d910f	修改接口	2022-05-24 11:29:11 +08:00
qdxkrs	15bc756bd4	修改冲突文件	2022-05-23 14:38:09 +08:00
qdxkrs	c424d5cd89	Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev # Conflicts: # ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java	2022-05-23 14:37:16 +08:00
qdxkrs	9b784c99ed	修改bug	2022-05-23 14:36:19 +08:00
songjinsheng	5041f3f92f	注解修改	2022-05-23 14:17:46 +08:00
songjinsheng	f4caf10bd3	合并更新	2022-05-23 09:49:01 +08:00
songjinsheng	bb6fb94038	Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev # Conflicts:1 # ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java	2022-05-23 09:48:47 +08:00
songjinsheng	7cfae514ea	控制器修改	2022-05-23 09:42:20 +08:00
qdxkrs	d262ec6b72	更新资源	2022-05-23 09:39:52 +08:00
qdxkrs	a51c6872d8	飞机✈保佑	2022-05-20 16:59:45 +08:00
songjinsheng	afa068f477	修改mapper	2022-05-20 15:17:51 +08:00
qdxkrs	c6fa415356	优化目录	2022-05-20 14:42:13 +08:00
qdxkrs	6006a9f18c	优化项目结构	2022-05-20 14:27:08 +08:00
songjinsheng	1722abfae7	Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms into dev	2022-05-20 14:20:17 +08:00
songjinsheng	57db36e015	no message	2022-05-20 14:19:34 +08:00
songjinsheng	43e3d8cfea	修改控制器	2022-05-20 14:19:25 +08:00
songjinsheng	598860d544	11	2022-05-20 11:56:55 +08:00