解决数据异常

ruoyi-admin/src/main/java/com/ruoyi/biz/controller/DataController.java

@@ -43,13 +43,13 @@ public class DataController extends BaseController {
         LocalDateTime ldt = LocalDateTime.of(localDate, LocalTime.MIN);
         for (; sp <= ep; sp++) {
             //先删除数据，再进行
-            LocalDateTime start = ldt.plusHours(2 * sp).minusHours(2);
-            LocalDateTime end = start.plusHours(2);
+            LocalDateTime start = ldt.plusHours(1 * sp).minusHours(1);
+            LocalDateTime end = start.plusHours(1);
             Long startTime = start.toInstant(ZoneOffset.of("+8")).toEpochMilli();
             Long endTime = end.toInstant(ZoneOffset.of("+8")).toEpochMilli();
-            String sql = "DELETE FROM TWIN_CALC_2HR WHERE DATA_DATE=? AND TIME_PERIOD=?";
+            String sql = "DELETE FROM TWIN_CALC_HOUR WHERE DATA_DATE=? AND HOUR=?";
             jdbcTemplate.update(sql, date, sp);
-            sql = "DELETE FROM TWIN_RECORD_ALARMS WHERE DATA_TIME>=? AND DATA_TIME<=?";
+            sql = "DELETE FROM TWIN_RECORD_ALARMS WHERE START_TIME<=? AND END_TIME>=?";
             jdbcTemplate.update(sql, new Date(startTime), new Date(endTime));
             sql = "DELETE FROM TWIN_PAN_HEAD_INFO WHERE RECORD_TIME>=? AND RECORD_TIME<=?";
             jdbcTemplate.update(sql, new Date(startTime), new Date(endTime));

ruoyi-admin/src/main/java/com/ruoyi/biz/task/TwinTask.java

@@ -3,9 +3,12 @@ package com.ruoyi.biz.task;
 import com.ruoyi.biz.service.IApiService;
 import com.ruoyi.biz.service.ITaskService;
 import com.ruoyi.biz.service.ITwinCalcDayService;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.time.*;
+import java.util.Date;
 
 /**
  * 定时任务调度测试
@@ -20,6 +23,8 @@ public class TwinTask {
     private ITwinCalcDayService dayService;
     @Resource
     private IApiService apiService;
+    @Resource
+    private JdbcTemplate jdbcTemplate;
 
     /**
      * 计算上一个小时数据
@@ -48,4 +53,22 @@ public class TwinTask {
     public void indexAlarms() {
         apiService.indexAlarms();
     }
+
+    /**
+     * 清理数据
+     *
+     * @param day 天数
+     */
+    public void clean(Integer day) {
+        LocalDate localDate = LocalDate.now();
+        LocalDateTime ldt = LocalDateTime.of(localDate, LocalTime.MIN).minusDays(day);
+        Date date = Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant());
+//        Long time = ldt.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        String sql = "DELETE FROM TWIN_CALC_ALARMS WHERE DATA_DATE<?";
+        jdbcTemplate.update(sql, date);
+        sql = "DELETE FROM TWIN_RECORD_ALARMS WHERE DATA_DATE<?";
+        jdbcTemplate.update(sql, date);
+        sql = "DELETE FROM TWIN_RECORD_STOP WHERE DATA_DATE<?";
+        jdbcTemplate.update(sql, date);
+    }
 }

ruoyi-admin/src/main/resources/templates/biz/data/data.html

@@ -12,8 +12,8 @@
     <div class="col-sm-6">
         <div class="input-group date">
             <input id="date" name="date" class="time-input" placeholder="日期" type="text">&nbsp;
-            <input type="number" id="sp" placeholder="开始时段" min="1" max="12" step="1" value="1"/> 至
-            <input type="number" id="ep" placeholder="结束时段" min="1" max="12" step="1" value="1"/>
+            <input type="number" id="sp" placeholder="开始时段" min="0" max="23" step="1" value="1"/> 至
+            <input type="number" id="ep" placeholder="结束时段" min="0" max="12" step="1" value="1"/>
         </div>
     </div>
     <label class="col-sm-2 control-label">

ruoyi-admin/src/main/resources/templates/biz/hour/hour.html

@@ -99,6 +99,8 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                sortName: "id",
+                sortOrder: "desc",
                 modalName: "1小时统计数据",
                 columns: [{
                     checkbox: true
@@ -175,4 +177,4 @@
         });
     </script>
 </body>
-</html>
+</html>