Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/reservat/BomanReservatController.java

@@ -123,7 +123,6 @@ public class BomanReservatController extends BaseController
     /**
      * 陵园实时参观统计
      */
-    @PreAuthorize("@ss.hasPermi('system:reservat:realTime')")
     @GetMapping("/statistics/realTime")
     public AjaxResult realTime()
     {
@@ -133,7 +132,6 @@ public class BomanReservatController extends BaseController
     /**
      * 陵园实时参观统计
      */
-    @PreAuthorize("@ss.hasPermi('system:reservat:people')")
     @GetMapping("/statistics/people")
     public AjaxResult people()
     {

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

@@ -112,7 +112,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/boman/common/**","/sendSms/**").permitAll()
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
                 .antMatchers("/system/personnel/**", "/reservat/config/**", "/reservat/time/**","/system/reservat/**","/system/news/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanReservatServiceImpl.java

@@ -245,7 +245,7 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         long todayYy = 0;
         for (BomanReservat bomanReservat : bomanReservatYearList) {
             yearYy = yearYy + Long.parseLong(bomanReservat.getVisitNum());
-            if (bomanReservat.getVisitDate().contains(time.substring(0, time.lastIndexOf("_")))) {
+            if(bomanReservat.getVisitDate().contains(time.substring(0,time.lastIndexOf("-")))){
                 monthYy = monthYy + Long.parseLong(bomanReservat.getVisitNum());
             }
             if (bomanReservat.getVisitDate().equals(time)) {
@@ -313,13 +313,4 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         return dateList;
     }
 
-    public static void main(String[] args) {
-        //获取近7天的数组
-        List<String> sevenDate = getSevenDate();
-        for (String s : sevenDate) {
-            System.out.println(s);
-        }
-
-    }
-
 }