Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Song:dev
Branches Tags
Song:master
Song:dev_sjs
Song:dev
Song:v3.8.2
Song:v3.8.1
Song:v3.8.0
Song:v3.7.0
Song:v3.6.0
Song:v3.5.0
Song:v3.4.0
Song:v3.3.0
Song:v3.2.1
Song:v3.2
Song:v3.1
Song:v3.0
Song:v2.3
Song:v2.2
Song:v2.1
Song:v2.0
Song:v1.0
..
compare: Song:master
Branches Tags
Song:dev_sjs
Song:master
Song:dev
Song:v3.8.2
Song:v3.8.1
Song:v3.8.0
Song:v3.7.0
Song:v3.6.0
Song:v3.5.0
Song:v3.4.0
Song:v3.3.0
Song:v3.2.1
Song:v3.2
Song:v3.1
Song:v3.0
Song:v2.3
Song:v2.2
Song:v2.1
Song:v2.0
Song:v1.0

1 Commits
dev ... master

Author SHA1 Message Date
18536819133
4af1c07029 修改配置 2023-10-20 16:25:34 +08:00
58 changed files with 105 additions and 1799 deletions
Show Stats Expand all files Collapse all files

19
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -1,16 +1,9 @@
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;
/**
* 启动程序
@ -23,12 +16,20 @@ 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" +
// " ''-' `'-' `-..-' ");
}
}

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

@ -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"))))
{
return error("当前系统没有开启注册功能！");
}
// if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
// {
// return error("当前系统没有开启注册功能！");
// }
String msg = registerService.register(user);
return StringUtils.isEmpty(msg) ? success() : error(msg);
}

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

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

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

@ -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);
}
}

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

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

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

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

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

@ -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);
} /**

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

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

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

@ -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.*;
@ -34,7 +33,7 @@ public class ThematicMapController {
private ThematicMapService thematicMapService;
/**
* 查询专题图
* 查询方法
* @param response 响应头
* @return 参数类
*/
@ -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.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

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

@ -37,9 +37,9 @@ public class VegetationCoverageController {
*/
@RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult selectVegetation(String type)
public AjaxResult selectVegetation()
{
List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation(type);
List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
return AjaxResult.success(eastVOSList);
}

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

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

18
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -2,17 +2,17 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.cj.jdbc.Driver
# driverClassName: com.mysql.cj.jdbc.Driver
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
# url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# username: saas
# password: XKrs123.
#url: jdbc:postgresql://47.243.79.66: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: postgres
# password: postgres
url: jdbc:postgresql://118.195.242.28:5432/yada?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: gty
password: 308525
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -35,7 +35,7 @@ spring:
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效select * from pg_stat_activity
# validationQuery: SELECT 1 FROM DUAL
# validationQuery: SELECT 1 FROM DUAL
validationQuery: SELECT version()
testWhileIdle: true
testOnBorrow: false

5
ruoyi-admin/src/main/resources/application.yml
View File

@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath #/home/sjs/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:

2
ruoyi-admin/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/home/sjs/ruoyi/logs/yada" />
<property name="log.path" value="/home/ruoyi/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

3
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java
View File

@ -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();

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@ -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();

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

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

98
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java
View File

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

137
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java
View File

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

110
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java
View File

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

10
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java
View File

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

89
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/MapServicesVO.java
View File

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

60
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java
View File

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

69
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java
View File

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

78
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java
View File

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

10
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
View File

@ -33,8 +33,6 @@ public class ThematicMapDomain extends SysBaseEntity {
private String createdBy;
private String year;
private LocalDateTime createdTime;
public String getPictureCode() {
@ -157,12 +155,4 @@ public class ThematicMapDomain extends SysBaseEntity {
", createdTime=" + createdTime +
'}';
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
}

92
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java
View File

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

5
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
View File

@ -24,7 +24,6 @@ public interface AorestCoverageMapper {
List<UploadFile> selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName);
List<Dictionary> selectDic(@Param("codingType") String codingType);
List<Dictionary> selectNow(@Param("codingType2") String codingType2);
List<Dictionary> selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1,
@Param("codingType2") String codingType2);
}

28
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
View File

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

19
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java
View File

@ -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);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java
View File

@ -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);

28
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
View File

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

12
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java
View File

@ -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,16 +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("particularYear") String particularYear);
/**
* 删除专题图根据编号
* @param id 编号

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java
View File

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

4
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
View File

@ -26,6 +26,6 @@ public interface IAorestCoverageService {
public List<UploadFile> selectUpload(String fileId,String fileName);
List<Dictionary> selectDic(String codingType);
List<Dictionary> selectNow(String codingType2);
List<Dictionary> selectDic(String codingType,String codingType1,
String codingType2);
}

23
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java
View File

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

19
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java
View File

@ -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);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java
View File

@ -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);

20
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
View File

@ -1,29 +1,9 @@
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);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java
View File

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

10
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java
View File

@ -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,String particularYear);
/**
* 删除专题图根据编号
* @param id 编号

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

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

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

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

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

@ -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);
}
}

4
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java
View File

@ -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

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

@ -1,57 +1,12 @@
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);
}
}

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

@ -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,String particularYear) {
return thematicMapMapper.selMapServers(chartName,chartType,particularYear);
}
/**
* 删除专题图根据编号
* @param id 编号

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

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

38
ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
View File

@ -125,38 +125,22 @@ 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>
</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};
<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>
</mapper>

115
ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
View File

@ -1,115 +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_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>

66
ruoyi-system/src/main/resources/mapper/system/CityMapper.xml
View File

@ -1,66 +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="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>

3
ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
View File

@ -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">

2
ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml
View File

@ -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'
where particular_year='2020.0'
<!-- WHERE 1=1-->
<!-- <if test="particularYear!= null and particularYear !=''">-->

127
ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
View File

@ -1,127 +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.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>

32
ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
View File

@ -15,45 +15,15 @@ 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,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
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,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

8
ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml
View File

@ -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="type!= null and type !=''">
AND type = #{type}
</if>
<!-- WHERE 1=1-->
<!-- <if test="particularYear!= null and particularYear !=''">-->
<!-- AND particular_year = #{particularYear}-->
<!-- </if>-->
<!-- <if test="region != null and region !=''">-->
<!-- AND region = #{region}-->
<!-- </if>-->

19
ruoyi-ui/src/views/tool/swagger/index.vue
View File

@ -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