解决BUG

jjt-biz/src/main/java/com/jjt/biz/service/impl/ApiServiceImpl.java

@@ -342,8 +342,7 @@ public class ApiServiceImpl implements IApiService {
 //        if (bl != null && flag.equals(bl)) {
 //            return;
 //        }
-//        taskService.calc2Curr();
-//        indexCalc();
-//        indexAlarms();
+        curr();
+//        today();
     }
 }

jjt-biz/src/main/java/com/jjt/task/CalcTask.java

@@ -21,7 +21,7 @@ public class CalcTask {
     private ITwinCalcDayService dayService;
 
     /**
-     * 统计当前数据
+     * 统计上一时段数据
      */
     public void last() {
         calcHourService.last();

jjt-biz/src/main/java/com/jjt/task/OrderTask.java

@@ -30,7 +30,7 @@ public class OrderTask {
     /**
      * 获取昨日订单
      */
-    public void getOrder() {
+    public void day() {
         LocalDate localDate = LocalDate.now().minusDays(1);
         orderService.getOrder(localDate);
     }

jjt-biz/src/main/resources/mapper/calc/TwinCalcHourMapper.xml

@@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedBy != null  and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if>
             <if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if>
             <if test="remark != null  and remark != ''"> and REMARK = #{remark}</if>
+            <if test="params.sTime != null and params.eTime != null">
+                and DATEADD(hour, HOUR, DATA_DATE) between #{params.sTime} and #{params.eTime}
+            </if>
         </where>
     </select>
 

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

@@ -109,7 +109,7 @@ public class SecurityConfig {
                 .authorizeHttpRequests((requests) -> {
                     permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                     // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                    requests.antMatchers("/login", "/register", "/captchaImage", "/api/**").permitAll()
+                    requests.antMatchers("/login", "/register", "/captchaImage", "/api/**", "/**").permitAll()
                             // 静态资源，可匿名访问
                             .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                             .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()