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

更新

Browse Source
This commit is contained in:
songjinsheng
2022-08-16 08:36:53 +08:00
parent 52095ccd04
commit 854afa033d
19 changed files with 506 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,15 @@
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;
/**
@ -19,6 +23,7 @@ public class RuoYiApplication
{
public static void main(String[] args)
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println();

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

@ -61,6 +61,11 @@ public class CityExpandControllerr
*/
@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);

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

@ -1,13 +1,20 @@
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;
/**
* 专题报告
*/
@ -17,6 +24,61 @@ import org.springframework.web.bind.annotation.RestController;
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)
@ -25,10 +87,10 @@ public class SpecialReportController
switch (path)
{
case "ch":
route="avatar/word/全球生态环境遥感监测2021年度报告-中文版-20220309.docx";
route="avatar/word/陆域中文1130.pdf";
break;
case "en":
route="avatar/word/全球生态环境遥感监测2021年度报告-英文简本-20211102.docx";
route="avatar/word/陆域中文1130.pdf";
break;
default:
return AjaxResult.error("未找到对应路径");

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

@ -6,6 +6,7 @@ spring:
driver-class-name: org.postgresql.Driver
druid:
master:
#url: jdbc:postgresql://121.36.229.60:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: sjs
password: song5325

3
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
profile: D:/ruoyi/uploadPath #/home/sjs/ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
@ -134,3 +134,4 @@ xss:
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*

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/ruoyi/logs" />
<property name="log.path" value="/home/sjs/ruoyi/logs/yada" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />