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

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

Browse Source 
# Conflicts:1
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
This commit is contained in:
songjinsheng
2022-05-23 09:48:47 +08:00
parent 7cfae514ea d262ec6b72
commit bb6fb94038
11 changed files with 446 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.ruoyi;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
*
* @author ruoyi
*/
@MapperScan("com.ruoyi.system.mapper_yada")
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
{

70
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java Normal file
View File

@ -0,0 +1,70 @@
package com.ruoyi.web.controller.yada;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain_yada.ThematicMapDomain;
import com.ruoyi.system.service_yada.ThematicMapService;
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.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 中国城市监测
* @Author: JinSheng Song
* @Date: 2022/5/11 10:55
*/
@RestController
@RequestMapping(value = "/thematic-map")
public class ThematicMapController {
@Resource
private ThematicMapService thematicMapService;
/**
* 查询方法
* @param response
* @param request
* @return
*/
@RequestMapping(value = "/get/all",method = {RequestMethod.GET})
public AjaxResult selectAllThematicMap(HttpServletResponse response, HttpServletRequest request)
{
List<ThematicMapDomain> res= thematicMapService.selectAll();
return AjaxResult.success(res);
}
/**
* 删除方法
* @param id
* @return
*/
@RequestMapping(value = "/delete",method = {RequestMethod.DELETE})
public AjaxResult deleteThematicMap(@Param("id") Long id)
{
int num = thematicMapService.deleteById(id);
if (num>0) {
return AjaxResult.success();
}
return AjaxResult.error();
}
/**
* 新增方法
* @param thematicMapDomain
* @return
*/
@RequestMapping(value = "/add",method = {RequestMethod.POST})
public AjaxResult saveThematicMap(ThematicMapDomain thematicMapDomain)
{
int num = thematicMapService.save(thematicMapDomain);
if (num>0) {
return AjaxResult.success();
}
return AjaxResult.error();
}
}

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

@ -18,7 +18,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8080
port: 9900
servlet:
# 应用的访问路径
context-path: /
@ -97,9 +97,9 @@ token:
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain
typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
@ -116,6 +116,7 @@ swagger:
# 请求前缀
pathMapping: /dev-api
# 防止XSS攻击
xss:
# 过滤开关

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

@ -1,24 +1,34 @@
Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
// _ooOoo_ //
// o6666666o //
// 88" . "88 //
// (| ^_^ |) //
// O\ = /O //
// ____/`---'\____ //
// .' \\| |// `. //
// / \\||| : |||// \ //
// / _||||| -:- |||||- \ //
// | | \\\ - /// | | //
// | \_| ''\---/'' | | //
// \ .-\__ `-` ___/-. / //
// ___`. .' /--.--\ `. . ___ //
// ."" '< `.___\_<|>_/___.' >'"". //
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
// \ \ `-. \_ __\ /__ _/ .-` / / //
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
/\
| |
| |
.' '.
| |
| |
| /\ |
.' |__|'.
| | | |
.' | | '.
/\ | \__/ | /\
| | | | | | | |
/| | |,-\ | | /-,| | |\
|| |,-' | | | | '-,| ||
||-' | | | | '-||
|\ _,-' | | | | '-,_ /|
|| ,-' _ | | | | '-, ||
||-' =(*)= | | | | '-||
|| | \ / | ||
|\________....--------\ || /--------....________/|
/| || |\
/ | || | \
/ | \/ | \
/ | | \
// .| |. \\
.' |_./ | | \._| '.
/ _.-||| |||-._ \
\__.-' \||/\||/ '-.__/
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// 佛祖保佑 永不宕机 永无BUG //
// 飞机保佑 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////