7 Commits

Author SHA1 Message Date
fb972249dc 修改bug 2024-06-25 10:10:53 +08:00
e29636522d 修改bug 2024-06-20 16:22:56 +08:00
4dd8ed7a0d 提交专题报告年 2023-10-21 13:34:20 +08:00
34bf6a2580 提交专题报告年 2023-10-20 17:14:48 +08:00
e9a3ad8dc2 修改配置 2023-10-20 16:48:19 +08:00
b9c6dec44f Merge remote-tracking branch 'origin/dev_sjs'
# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml
2023-10-20 16:46:38 +08:00
4af1c07029 修改配置 2023-10-20 16:25:34 +08:00
17 changed files with 78 additions and 68 deletions

View File

@ -28,10 +28,10 @@ public class SysRegisterController extends BaseController
@PostMapping("/register") @PostMapping("/register")
public AjaxResult register(@RequestBody RegisterBody user) 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); String msg = registerService.register(user);
return StringUtils.isEmpty(msg) ? success() : error(msg); return StringUtils.isEmpty(msg) ? success() : error(msg);
} }

View File

@ -70,8 +70,8 @@ public class ENSOImpactController {
@RequestMapping(value = "/ensoYearEventCorresponding", method = {RequestMethod.GET}) @RequestMapping(value = "/ensoYearEventCorresponding", method = {RequestMethod.GET})
@ApiOperation(value = "年份与ENSO事件对应关系", httpMethod = "GET") @ApiOperation(value = "年份与ENSO事件对应关系", httpMethod = "GET")
public AjaxResult ensoYearEventCorresponding(@RequestParam(value = "year") String year) { public AjaxResult ensoYearEventCorresponding(@RequestParam(value = "year") String year,@RequestParam(value = "dq",required = false)String qd) {
ENSOYearEventCorrespondingEntity ensoYearEventCorrespondingEntity = ensoImpactService.ensoYearEventCorresponding(year); ENSOYearEventCorrespondingEntity ensoYearEventCorrespondingEntity = ensoImpactService.ensoYearEventCorresponding(year,qd);
return AjaxResult.success(ensoYearEventCorrespondingEntity); return AjaxResult.success(ensoYearEventCorrespondingEntity);
} }
@ -79,8 +79,9 @@ public class ENSOImpactController {
@ApiOperation(value = "四类ENSO事件空间分布统计", httpMethod = "GET") @ApiOperation(value = "四类ENSO事件空间分布统计", httpMethod = "GET")
public AjaxResult ensoEventRate(@RequestParam(value = "type") String type, public AjaxResult ensoEventRate(@RequestParam(value = "type") String type,
@RequestParam(value = "zone") String zone, @RequestParam(value = "zone") String zone,
@RequestParam(value = "year") String year) { @RequestParam(value = "year") String year,
ENSOEventRateEntity ensoEventRateEntity = ensoImpactService.ensoEventRate(type, zone, year); @RequestParam(value = "dq",required = false) String dq) {
ENSOEventRateEntity ensoEventRateEntity = ensoImpactService.ensoEventRate(type, zone, year,dq);
return AjaxResult.success(ensoEventRateEntity); return AjaxResult.success(ensoEventRateEntity);
} }

View File

@ -60,8 +60,8 @@ public class SpecialReportController {
@RequestMapping(value = "/getUploadSpecial") @RequestMapping(value = "/getUploadSpecial")
@ApiOperation(value = "返回专题通报") @ApiOperation(value = "返回专题通报")
public AjaxResult getUploadSpecial(String fileName) { public AjaxResult getUploadSpecial(String fileName,@RequestParam(value = "year",required = false) String year) {
List<UploadSpecialVO> value = service.selectUploadSpecial(fileName); List<UploadSpecialVO> value = service.selectUploadSpecial(fileName,year);
return AjaxResult.success(value); return AjaxResult.success(value);
} }

View File

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

View File

@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath # 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath
profile: /home/sjs/ruoyi/uploadPath profile: /home/gty/ruoyi/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
@ -18,8 +18,8 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口默认为8080 # 服务器的HTTP端口默认为8080
port: 6061 port: 8080
#port: 8080 #port: 6061
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -66,7 +66,7 @@ spring:
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: sdust2020 password: '*&jkjusWETO(^ses%i'
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:

View File

@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/*/api-docs").anonymous() .antMatchers("/*/api-docs").anonymous()
.antMatchers("/druid/**").anonymous() .antMatchers("/druid/**").anonymous()
// // 除上面外的所有请求全部需要鉴权认证 // // 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated() //.anyRequest().authenticated()
.and() .and()
.headers().frameOptions().disable(); .headers().frameOptions().disable();
httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler); httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);

View File

@ -56,15 +56,15 @@ public class SysLoginService
*/ */
public String login(String username, String password, String code) public String login(String username, String password, String code)
{ {
CaptchaVO captchaVO = new CaptchaVO(); // CaptchaVO captchaVO = new CaptchaVO();
captchaVO.setCaptchaVerification(code); // captchaVO.setCaptchaVerification(code);
ResponseModel response = captchaService.verification(captchaVO); // ResponseModel response = captchaService.verification(captchaVO);
if (!response.isSuccess()) // if (!response.isSuccess())
{ // {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, // AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
MessageUtils.message("user.jcaptcha.error"))); // MessageUtils.message("user.jcaptcha.error")));
throw new CaptchaException(); // throw new CaptchaException();
} // }
// 用户验证 // 用户验证
Authentication authentication = null; Authentication authentication = null;
try try

View File

@ -41,12 +41,12 @@ public class SysRegisterService
{ {
String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); 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)) if (StringUtils.isEmpty(username))
{ {
@ -56,16 +56,16 @@ public class SysRegisterService
{ {
msg = "用户密码不能为空"; 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))) else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
{ {
msg = "保存用户'" + username + "'失败,注册账号已存在"; msg = "保存用户'" + username + "'失败,注册账号已存在";
@ -89,7 +89,6 @@ public class SysRegisterService
} }
return msg; return msg;
} }
/** /**
* 校验验证码 * 校验验证码
* *

View File

@ -27,6 +27,16 @@ public class UploadSpecialVO extends SysBaseEntity {
private String sign; private String sign;
private String year;
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getId() { public String getId() {
return id; return id;
} }

View File

@ -68,7 +68,7 @@ public interface ENSOImpactMapper {
* @param year * @param year
* @return * @return
*/ */
ENSOYearEventCorrespondingEntity ensoYearEventCorresponding(@Param("year") String year); List<ENSOYearEventCorrespondingEntity> ensoYearEventCorresponding(@Param("year") String year,@Param("dq")String dq);
/** /**
* ENSO事件与年份对应关系 * ENSO事件与年份对应关系
@ -85,7 +85,7 @@ public interface ENSOImpactMapper {
* @param type * @param type
* @return * @return
*/ */
ENSOEventRateEntity ensoEventRate(@Param("type") String type, List<ENSOEventRateEntity> ensoEventRate(@Param("type") String type,
@Param("zone") String zone, @Param("zone") String zone,
@Param("event") String event); @Param("event") String event);

View File

@ -14,7 +14,7 @@ public interface SpecialReportMapper {
List<SpecialVO> selectSpecial(@Param("zone") String zone); List<SpecialVO> selectSpecial(@Param("zone") String zone);
List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName); List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName,@Param("year")String year);
List<UploadSpecialVO> selectUploadSpecial1(@Param("fileName") String fileName); List<UploadSpecialVO> selectUploadSpecial1(@Param("fileName") String fileName);

View File

@ -54,7 +54,7 @@ public interface ENSOImpactService {
* @param year * @param year
* @return * @return
*/ */
ENSOYearEventCorrespondingEntity ensoYearEventCorresponding(String year); ENSOYearEventCorrespondingEntity ensoYearEventCorresponding(String year,String qd);
/** /**
* 四类ENSO事件空间分布统计 * 四类ENSO事件空间分布统计
@ -63,7 +63,7 @@ public interface ENSOImpactService {
* @param year * @param year
* @return * @return
*/ */
ENSOEventRateEntity ensoEventRate(String type,String zone,String year); ENSOEventRateEntity ensoEventRate(String type,String zone,String year,String dq);
/** /**
* 特定年份异常占比 * 特定年份异常占比

View File

@ -15,7 +15,7 @@ public interface ISpecialReportService {
List<SpecialVO> selectSpecial(String zone); List<SpecialVO> selectSpecial(String zone);
List<UploadSpecialVO> selectUploadSpecial(String fileName); List<UploadSpecialVO> selectUploadSpecial(String fileName,String year);
List<UploadSpecialVO> selectUploadSpecial1(String fileName); List<UploadSpecialVO> selectUploadSpecial1(String fileName);

View File

@ -76,14 +76,14 @@ public class ENSOImpactImpl implements ENSOImpactService {
} }
@Override @Override
public ENSOYearEventCorrespondingEntity ensoYearEventCorresponding(String year) { public ENSOYearEventCorrespondingEntity ensoYearEventCorresponding(String year,String qd) {
return ensoImpactMapper.ensoYearEventCorresponding(year); return ensoImpactMapper.ensoYearEventCorresponding(year,qd).get(0);
} }
@Override @Override
public ENSOEventRateEntity ensoEventRate(String type, String zone, String year) { public ENSOEventRateEntity ensoEventRate(String type, String zone, String year,String dq) {
String event = ensoImpactMapper.ensoYearEventCorresponding(year).getEvent(); String event = ensoImpactMapper.ensoYearEventCorresponding(year,dq).get(0).getEvent();
return ensoImpactMapper.ensoEventRate(type, zone, event); return ensoImpactMapper.ensoEventRate(type, zone, event).size()==0?null:ensoImpactMapper.ensoEventRate(type, zone, event).get(0);
} }
@Override @Override

View File

@ -27,8 +27,8 @@ public class SpecialReportServiceimpl implements ISpecialReportService {
} }
@Override @Override
public List<UploadSpecialVO> selectUploadSpecial(String fileName) { public List<UploadSpecialVO> selectUploadSpecial(String fileName,String year) {
return mapper.selectUploadSpecial(fileName); return mapper.selectUploadSpecial(fileName,year);
} }
@Override @Override

View File

@ -125,7 +125,7 @@
<select id="ensoYearEventCorresponding" resultMap="ENSO_Year_Event_Corresponding"> <select id="ensoYearEventCorresponding" resultMap="ENSO_Year_Event_Corresponding">
select id, year, event, event_en select id, year, event, event_en
from enso_year_event_corresponding from enso_year_event_corresponding
where year = #{year} where year = #{year} <if test="dq!=null and dq!=''"> and event like '${dq}%'</if>
</select> </select>
<select id="ensoEventYearCorresponding" resultMap="ENSO_Year_Event_Corresponding"> <select id="ensoEventYearCorresponding" resultMap="ENSO_Year_Event_Corresponding">

View File

@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT <include refid="Upload"/> FROM upload_special SELECT <include refid="Upload"/> FROM upload_special
WHERE type='1' WHERE type='1'
<if test="fileName!= null and fileName !=''"> <if test="fileName!= null and fileName !=''">
AND file_name = #{fileName} AND file_name = #{fileName} and year=#{year}
</if> </if>
</select> </select>