解决小小BUG

jjt-admin/src/test/java/com/jjt/data/EnergyTest.java

@@ -21,7 +21,7 @@ import java.time.LocalTime;
  * 印花机
  */
 @SpringBootTest(classes = JjtApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("devp")
+//@ActiveProfiles("devp")
 public class EnergyTest {
     @Resource
     private IotService iotService;
@@ -74,8 +74,8 @@ public class EnergyTest {
 
     @Test
     void day() {
-        for (int i = 10; i < 23; i++) {
-            String d = "2025-04-" + (i < 10 ? "0" + i : i);
+        for (int i = 7; i < 11; i++) {
+            String d = "2025-08-" + (i < 10 ? "0" + i : i);
             LocalDate localDate = LocalDate.parse(d);
             calcService.calc(localDate);
         }

jjt-admin/src/test/java/com/jjt/rz/RzCalcTest.java

@@ -1,6 +1,7 @@
 package com.jjt.rz;
 
 import com.jjt.JjtApplication;
+import com.jjt.calc.service.ITwinCalcHourYhjService;
 import com.jjt.ws.domain.TwinRzCalcMonth;
 import com.jjt.ws.service.ITwinRzCalcMonthService;
 import org.junit.jupiter.api.Test;
@@ -22,6 +23,14 @@ import java.util.*;
 public class RzCalcTest {
     @Resource
     private ITwinRzCalcMonthService rzCalcMonthService;
+    @Resource
+    private ITwinCalcHourYhjService twinCalcHourYhjService;
+
+    @Test
+    public void bl() {
+        //  补录印花线数据
+        twinCalcHourYhjService.calc2Curr();
+    }
 
     @Test
     public void test() {
@@ -32,6 +41,7 @@ public class RzCalcTest {
         List<TwinRzCalcMonth> list = rzCalcMonthService.selectTwinRzCalcMonthList(calcMonth);
         list.size();
     }
+
     private static final Random random = new Random();
     private static final int SCALE = 2; // 保留小数位数
     private static final double DEVIATION_PERCENT = 0.25; // 波动幅度30%

jjt-admin/src/test/java/com/jjt/wk/EmpCalcTest.java

@@ -34,9 +34,9 @@ public class EmpCalcTest {
 
     @Test
     public void test() {
-        String s = "2025-07-20";
+        String s = "2025-08-10";
         Date date = DateUtils.parseDate(s);
-        empCalcService.calcNew(date);
+        empCalcService.calc(date);
     }
 
     @Test

jjt-biz/src/main/java/com/jjt/utils/AsyncYhjService.java

@@ -88,7 +88,7 @@ public class AsyncYhjService {
         String sql = "select %s from " + yhj.getDevicePath() + " where time>%s and time <=%s";
 
         sql = String.format(sql, String.join(",", fields), startTime, endTime);
-            JSONObject jsonObject = iotService.query(sql);
+        JSONObject jsonObject = iotService.query(sql);
         JSONObject data = jsonObject.getJSONObject("data");
         JSONArray columnNames = data.getJSONArray("columnNames");
         JSONArray values = data.getJSONArray("values");

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

@@ -36,7 +36,11 @@
     <select id="selectTwinCalcHourSpecList" parameterType="TwinCalcHourSpec" resultMap="TwinCalcHourSpecResult">
         <include refid="selectTwinCalcHourSpecVo"/>
         <where>
-            <if test="dataDate != null ">and FORMAT(DATEADD(hour, HOUR - 7, DATA_DATE), 'yyyy-MM-dd') = #{dataDate}</if>
+            <if test="dataDate != null ">
+                and (
+                (DATA_DATE = #{dataDate} AND HOUR >= 7) OR (DATA_DATE = DATEADD(DAY, 1, #{dataDate}) AND HOUR &lt; 7)
+                )
+            </if>
             <if test="hour != null ">and HOUR = #{hour}</if>
             <if test="deviceId != null ">and DEVICE_ID = #{deviceId}</if>
             <if test="length != null ">and LENGTH = #{length}</if>
@@ -54,7 +58,7 @@
                 and hour=23
             </if>
         </where>
-        order by DATEADD(hour, HOUR, DATA_DATE)
+        order by data_date desc, hour
     </select>
 
     <select id="selectTwinCalcHourSpecById" parameterType="Long" resultMap="TwinCalcHourSpecResult">