修改配置

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

@@ -4,9 +4,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.util.ObjectUtils;
-
-
 
 /**
  * 启动程序
@@ -23,7 +20,16 @@ public class RuoYiApplication
         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" +
+//                " ''-'   `'-'    `-..-'              ");
     }
 
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -28,10 +28,10 @@ public class SysRegisterController extends BaseController
     @PostMapping("/register")
     public AjaxResult register(@RequestBody RegisterBody user)
     {
-        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+//        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
-        {
+//        {
-            return error("当前系统没有开启注册功能！");
+//            return error("当前系统没有开启注册功能！");
-        }
+//        }
         String msg = registerService.register(user);
         return StringUtils.isEmpty(msg) ? success() : error(msg);
     }

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

@@ -159,22 +159,14 @@ public class AorestCoverageController {
         return  upload;
     }
 
-    @RequestMapping(value = "/Dictionary",method = {RequestMethod.POST})
+    @RequestMapping(value = "/Dictionary")
     @ApiOperation(value = "字典查询",httpMethod = "POST")
      public  AjaxResult Dictionary(@RequestBody Dictionary dic)
      {
         List<Dictionary> diclist=service.selectDic(dic.getCodingType(),dic.getCodingType1(), dic.getCodingType2());
          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);
      }
 
 
+
 }

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

@@ -1,46 +0,0 @@
-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);
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.ruoyi.web.controller.yada;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.domain_yada.CityFocusVO;
-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 javax.xml.crypto.Data;
-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;
-
-    @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET})
-    public AjaxResult selectCityExpand(@Param("city") String city,@Param("cityCh") String cityCh,
-                                       @Param("year") String year)
-    {
-        List<CityFocusVO> value=service.selectExpand(city,cityCh,year);
-        return  AjaxResult.success(value);
-    }
-}

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

@@ -76,6 +76,11 @@ 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);
     }    /**

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

@@ -1,38 +0,0 @@
-package com.ruoyi.web.controller.yada;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-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;
-
-/**
- * 专题报告
- */
-@RestController
-@RequestMapping(value = "/business-service/api/Special", produces = "application/json;charset=UTF-8")
-@Api(tags = "专题报告")
-public class SpecialReportController
-{
-
-    @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/全球生态环境遥感监测2021年度报告-中文版-20220309.docx";
-                break;
-            case "en":
-                route="avatar/word/全球生态环境遥感监测2021年度报告-英文简本-20211102.docx";
-                break;
-            default:
-                return  AjaxResult.error("未找到对应路径");
-        }
-        return  AjaxResult.success(route);
-    }
-}

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

@@ -4,7 +4,6 @@ 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.*;
@@ -53,29 +52,6 @@ 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.POST})
-    public AjaxResult selectMap(HttpServletResponse response,
-                                String chartType,String chartName)
-    {
-        List<MapServicesVO> res= thematicMapService.selMapServers(chartName,chartType);
-        return AjaxResult.success(res);
-    }
-
     /**
      * 删除方法
      * @param id id

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,13 @@ spring:
         driver-class-name: org.postgresql.Driver
         druid:
             master:
-                url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+                #url: jdbc:postgresql://47.243.79.66:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
-                username: sjs
+                #url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
-                password: song5325
+                #                username: postgres
-#                url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+                #                password: postgres
-#                username: saas
+                url: jdbc:postgresql://118.195.242.28:5432/yada?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#                password: XKrs123.
+                username: gty
+                password: 308525
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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: /home/gty/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -19,6 +19,7 @@ ruoyi:
 server:
   # 服务器的HTTP端口，默认为8080
   port: 8080
+  #port: 6061
   servlet:
     # 应用的访问路径
     context-path: /
@@ -65,7 +66,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: sdust2020
+    password: '*&jkjusWETO(^ses%i'
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -134,3 +135,4 @@ xss:
   excludes: /system/notice/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+

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连接
+            //建立URL，把请求地址给补全，其中urlencode（）方法用于把params里的参数给取出来
             URL url = new URL(requestUrl+"?"+urlencode(params));
             //打开http连接
             HttpURLConnection httpUrlConn = (HttpURLConnection) url.openConnection();
@@ -40,6 +40,7 @@ public class WeatherUtils
             bufferedReader.close();
             inputStreamReader.close();
             inputStream.close();
+            inputStream = null;
             //断开连接
             httpUrlConn.disconnect();
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@@ -41,12 +41,12 @@ public class SysRegisterService
     {
         String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
 
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+//        boolean captchaOnOff = configService.selectCaptchaOnOff();
-        // 验证码开关
+//        // 验证码开关
-        if (captchaOnOff)
+//        if (captchaOnOff)
-        {
+//        {
-            validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
+//            validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
-        }
+//        }
 
         if (StringUtils.isEmpty(username))
         {
@@ -56,16 +56,16 @@ public class SysRegisterService
         {
             msg = "用户密码不能为空";
         }
-        else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+//        else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+//                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
-        {
+//        {
-            msg = "账户长度必须在2到20个字符之间";
+//            msg = "账户长度必须在2到20个字符之间";
-        }
+//        }
-        else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+//        else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+//                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
-        {
+//        {
-            msg = "密码长度必须在5到20个字符之间";
+//            msg = "密码长度必须在5到20个字符之间";
-        }
+//        }
         else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
         {
             msg = "保存用户'" + username + "'失败，注册账号已存在";
@@ -89,7 +89,6 @@ public class SysRegisterService
         }
         return msg;
     }
-
     /**
      * 校验验证码
      * 

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

@@ -1,88 +0,0 @@
-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 cityCh;
-
-    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 getCityCh() {
-        return cityCh;
-    }
-
-    public void setCityCh(String cityCh) {
-        this.cityCh = cityCh;
-    }
-}

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

@@ -1,110 +0,0 @@
-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;
-    }
-}

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

@@ -17,8 +17,6 @@ public class GlobalTypeVO extends  SysBaseEntity {
 
     private  Double area;
 
-    private  Double areaChange;
-
     private  int  particularYear;
 
     public String getId() {
@@ -68,12 +66,4 @@ 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;
-    }
 }

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

@@ -1,79 +0,0 @@
-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;
-
-    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;
-    }
-}

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

@@ -1,58 +0,0 @@
-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;
-
-    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;
-    }
-}

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

@@ -26,6 +26,4 @@ public interface AorestCoverageMapper {
 
     List<Dictionary> selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1,
                                @Param("codingType2") String codingType2);
-
-    List<Dictionary> selectNow(@Param("codingType2") String codingType2);
 }

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

@@ -1,17 +0,0 @@
-package com.ruoyi.system.mapper_yada;
-
-import com.ruoyi.system.domain_yada.CityFocusVO;
-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("cityCh") String cityCh,
-                                              @Param("year") String year);
-}

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

@@ -1,19 +0,0 @@
-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);
-}

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

@@ -1,10 +1,8 @@
 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;
@@ -23,15 +21,6 @@ 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 id 编号

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

@@ -28,5 +28,4 @@ public interface IAorestCoverageService {
 
     List<Dictionary> selectDic(String codingType,String codingType1,
                                 String codingType2);
-    List<Dictionary> selectNow(String codingType2);
 }

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

@@ -1,15 +0,0 @@
-package com.ruoyi.system.service_yada;
-
-import com.ruoyi.system.domain_yada.CityFocusVO;
-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 cityCh,String year);
-}

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

@@ -1,19 +0,0 @@
-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);
-}

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

@@ -1,8 +1,6 @@
 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;
@@ -21,14 +19,6 @@ public interface ThematicMapService {
      */
     List<ThematicMapDomain> selectAll(String pictureType,String pictureTypeOne, String pictureTypeTwo);
 
-    /**
-     * 获取地图服务
-     * @param chartName
-     * @param chartType
-     * @return
-     */
-    List<MapServicesVO> selMapServers(String chartName, String chartType);
-
     /**
      * 删除专题图根据编号
      * @param id 编号

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

@@ -55,9 +55,4 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService {
                                       String codingType2) {
         return  coverageMapper.selectDic(codingType,codingType1,codingType2);
     }
-
-    @Override
-    public List<Dictionary> selectNow(String codingType2) {
-        return  coverageMapper.selectNow(codingType2);
-    }
 }

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

@@ -1,28 +0,0 @@
-package com.ruoyi.system.service_yada.impl;
-
-import com.ruoyi.system.domain_yada.CityFocusVO;
-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.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 cityCh, String year) {
-        return mapper.selectExpand(city,cityCh,year);
-    }
-}

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

@@ -1,31 +0,0 @@
-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);
-    }
-}

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

@@ -1,6 +1,5 @@
 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;
@@ -30,11 +29,6 @@ public class ThematicMapServiceImpl implements ThematicMapService {
         return thematicMapMapper.selectAllThematicMap(pictureType,pictureTypeOne,pictureTypeTwo);
     }
 
-    @Override
-    public List<MapServicesVO> selMapServers(String chartName, String chartType) {
-        return thematicMapMapper.selMapServers(chartName,chartType);
-    }
-
     /**
      * 删除专题图根据编号
      * @param id 编号

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

@@ -143,10 +143,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </if>
                           )
     </select>
-
-
-    <select id="selectNow" resultMap="RM_Dictionary">
-        select <include refid="columnsdic"/> from dictionary
-        where coding_type =#{codingType2};
-    </select>
 </mapper> 

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

@@ -1,40 +0,0 @@
-<?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_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="cityCh" column="city_ch"/>
-        <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_ch
-        ]]>
-	</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="cityCh!= null and cityCh !=''">
-            AND city_ch = #{cityCh}
-        </if>
-        <if test="year!= null and year !=''">
-            AND year = #{year}
-        </if>
-    </select>
-
-</mapper>

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

@@ -1,65 +0,0 @@
-<?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="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
-        ]]>
-	</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 superior = #{gj}
-        </if>
-    </select>
-
-
-</mapper>

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

@@ -12,14 +12,13 @@ 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,area_change
+        id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time
         ]]>
 	</sql>
     <select id="selectGlobalType" resultMap="RM_GlobalType">

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

@@ -18,37 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"/>
-    </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
         ]]>
 	</sql>
-    <sql id="cloumns_Map">
-	    <![CDATA[
-        id,chart_name,chart_type,particular_year,layer,resolving_power
-        ]]>
-	</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>
-    </select>
 
     <select id="selectAllThematicMap" resultMap="RM_ThematicMap">
         SELECT  <include refid="columns"/>  FROM thematic_map

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

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <template>
   <i-frame :src="url" />
 </template>
@@ -15,21 +14,3 @@ 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