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

Merge branch 'master' into test

Browse Source
This commit is contained in:
songjinsheng 2022-05-20 09:00:37 +08:00
commit 95542bf4c9
70 changed files with 3401 additions and 3086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -16,7 +16,7 @@
<ruoyi.version>3.8.2</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<java.version>11</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.8</druid.version>
<bitwalker.version>1.21</bitwalker.version>

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

@ -16,11 +16,11 @@ public class RuoYiApplication
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" +
System.out.println("(♥◠‿◠)ﾉﾞ 我们一起学喵叫 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | _ _ \\ 喵 \\ \\ / / \n" +
" | ( ' ) | 喵 \\ _. / ' \n" +
" |(_ o _) / 喵 _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AdahTestingController.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.web.controller.RemoteSensing;
/**
* 亚大综合监测
* @Author: JinSheng Song
* @Date: 2022/5/11 9:08
*/
public class AdahTestingController {
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AtmosphereController.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.web.controller.RemoteSensing;
/**
* 大气质量监测
* @Author: JinSheng Song
* @Date: 2022/5/11 10:56
*/
public class AtmosphereController {
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ENSOController.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.web.controller.RemoteSensing;
/**
* ENSO影响监测
* @Author: JinSheng Song
* @Date: 2022/5/11 9:12
*/
public class ENSOController {
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ForestController.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.web.controller.RemoteSensing;
/**
* 森林监测
* @Author: JinSheng Song
* @Date: 2022/5/11 9:13
*/
public class ForestController {
}

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/GlobalEcologyController.java Normal file
View File

@ -0,0 +1,15 @@
package com.ruoyi.web.controller.RemoteSensing;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
*全球生态环境监测
* @Author: JinSheng Song
* @Date: 2022/5/11 9:05
*/
@RestController
@RequestMapping("/monitor/clobal")
public class GlobalEcologyController {
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/SpecialReportController.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.web.controller.RemoteSensing;
/**
* 专题报告
* @Author: JinSheng Song
* @Date: 2022/5/11 11:10
*/
public class SpecialReportController {
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/UrbanController.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.web.controller.RemoteSensing;
/**
* 城市监测
* @Author: JinSheng Song
* @Date: 2022/5/11 10:55
*/
public class UrbanController {
}

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
View File

@ -8,8 +8,11 @@ import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.config.RuoYiConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.Constants;
@ -33,10 +36,10 @@ public class CaptchaController
@Resource(name = "captchaProducerMath")
private Producer captchaProducerMath;
@Autowired
@Resource
private RedisCache redisCache;
@Autowired
@Resource
private ISysConfigService configService;
/**
* 生成验证码

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

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: password
url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: saas
password: XKrs123.
# 从库数据源
slave:
# 从数据源开关/默认关闭

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

@ -41,12 +41,15 @@ logging:
# Spring配置
spring:
# config:
# activate:
# on-profile: druid
profiles:
active: druid
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
# 文件上传
servlet:
multipart:
@ -66,9 +69,9 @@ spring:
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
database: 3
# 密码
password:
password: yhy_app
# 连接超时时间
timeout: 10s
lettuce:

2
ruoyi-admin/src/main/resources/banner.txt
View File

@ -2,7 +2,7 @@ Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
// _ooOoo_ //
// o8888888o //
// o6666666o //
// 88" . "88 //
// (| ^_^ |) //
// O\ = /O //

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

@ -15,7 +15,8 @@ public class PageUtils extends PageHelper
/**
* 设置请求分页数据
*/
public static void startPage()
public static void
startPage()
{
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.system.mapper;
/**
* @Author: JinSheng Song
* @Date: 2022/5/11 15:17
*/
public interface AdahTestingMapper {
}

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.system.mapper;
/**
* @Author: JinSheng Song
* @Date: 2022/5/11 15:17
*/
public interface AtmosphereMapper {
}

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.system.mapper;
/**
* @Author: JinSheng Song
* @Date: 2022/5/11 15:18
*/
public interface ENSOMapper {
}

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.system.mapper;
/**
* @Author: JinSheng Song
* @Date: 2022/5/11 15:18
*/
public interface ForestMapper {
}

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.system.mapper;
/**
* @Author: JinSheng Song
* @Date: 2022/5/11 15:18
*/
public interface GlobalEcologyMapper {
}

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.system.mapper;
/**
* @Author: JinSheng Song
* @Date: 2022/5/11 15:18
*/
public interface UrbanMapper {
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* 亚大综合监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:32
*/
public interface IAdahTestingService {
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* 大气质量监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:34
*/
public interface IAtmosphereService {
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* ENSO影响监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:35
*/
public interface IENSOService {
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* 森林监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:38
*/
public interface IForestService {
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* 全球生态环境监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:37
*/
public interface IGlobalEcologyService {
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/ISpecialReportService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* 专题报告
* @Author: JinSheng Song
* @Date: 2022/5/11 11:39
*/
public interface ISpecialReportService {
}

3
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View File

@ -2,12 +2,15 @@ package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.SysConfig;
import org.springframework.stereotype.Service;
/**
* 参数配置 服务层
*
* @author ruoyi
*/
public interface ISysConfigService
{
/**

9
ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java Normal file
View File

@ -0,0 +1,9 @@
package com.ruoyi.system.service;
/**
* 城市监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:40
*/
public interface IUrbanService {
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.IAdahTestingService;
/**
* 亚大综合监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:43
*/
public class AdahTestingServiceimpl implements IAdahTestingService {
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.IAtmosphereService;
/**
* 大气质量监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:45
*/
public class AtmosphereServiceimpl implements IAtmosphereService {
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.IENSOService;
/**
* ENSO影响监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:46
*/
public class ENSOServiceimpl implements IENSOService {
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.IForestService;
/**
* 森林监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:47
*/
public class ForestServiceimpl implements IForestService {
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.IGlobalEcologyService;
/**
* 全球生态环境监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:47
*/
public class GlobalEcologyServiceimpl implements IGlobalEcologyService {
}

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SpecialReportServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.ISpecialReportService;
/**
* 专题报告
* @Author: JinSheng Song
* @Date: 2022/5/11 11:48
*/
public class SpecialReportServiceimpl implements ISpecialReportService {
}

5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
@ -25,10 +26,10 @@ import java.util.List;
@Service
public class SysConfigServiceImpl implements ISysConfigService
{
@Autowired
@Resource
private SysConfigMapper configMapper;
@Autowired
@Resource
private RedisCache redisCache;
/**

11
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.system.service.IUrbanService;
/**
* * 城市监测
* @Author: JinSheng Song
* @Date: 2022/5/11 11:49
*/
public class UrbanServiceimpl implements IUrbanService {
}

8
ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml Normal file
View File

@ -0,0 +1,8 @@
<?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.AdahTestingMapper">
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml Normal file
View File

@ -0,0 +1,8 @@
<?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.AtmosphereMapper">
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml Normal file
View File

@ -0,0 +1,8 @@
<?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.ENSOMapper">
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml Normal file
View File

@ -0,0 +1,8 @@
<?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.ForestMapper">
</mapper>

7
ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?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.GlobalEcologyMapper">
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml Normal file
View File

@ -0,0 +1,8 @@
<?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.UrbanMapper">
</mapper>

2
ruoyi-ui/package.json
View File

@ -39,7 +39,7 @@
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.19.1",
"core-js": "^3.19.1",
"echarts": "4.9.0",
"element-ui": "2.15.8",
"file-saver": "2.0.5",