修改bug

# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml

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

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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ENSOImpactController.java

@@ -70,8 +70,8 @@ public class ENSOImpactController {
 
     @RequestMapping(value = "/ensoYearEventCorresponding", method = {RequestMethod.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);
     }
 
@@ -79,8 +79,9 @@ public class ENSOImpactController {
     @ApiOperation(value = "四类ENSO事件空间分布统计", httpMethod = "GET")
     public AjaxResult ensoEventRate(@RequestParam(value = "type") String type,
                                     @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);
     }
 

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

@@ -60,8 +60,8 @@ public class SpecialReportController {
 
     @RequestMapping(value = "/getUploadSpecial")
     @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);
     }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -2,24 +2,24 @@
 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://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: 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:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
+                url:
-                username: 
+                username:
-                password: 
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,12 +35,12 @@ 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
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true

ruoyi-admin/src/main/resources/application.yml

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

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

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

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -56,15 +56,15 @@ public class SysLoginService
      */
     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;
         try

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

@@ -41,12 +41,12 @@ public class SysRegisterService
     {
         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))
         {
@@ -56,16 +56,16 @@ public class SysRegisterService
         {
             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)))
         {
             msg = "保存用户'" + username + "'失败，注册账号已存在";
@@ -89,7 +89,6 @@ public class SysRegisterService
         }
         return msg;
     }
-
     /**
      * 校验验证码
      * 

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java

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

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ENSOImpactMapper.java

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

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java

@@ -14,7 +14,7 @@ public interface SpecialReportMapper {
 
   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);
 

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ENSOImpactService.java

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

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java

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

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ENSOImpactImpl.java

@@ -76,14 +76,14 @@ public class ENSOImpactImpl implements ENSOImpactService {
     }
 
     @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
-    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

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

@@ -27,8 +27,8 @@ public class SpecialReportServiceimpl implements ISpecialReportService {
     }
 
     @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

ruoyi-system/src/main/resources/mapper/system/ENSOImpactMapper.xml

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

ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml

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