修改可按ids查询设备列表

jjt-admin/src/test/java/com/jjt/task/TaskTest.java

@@ -43,7 +43,7 @@ public class TaskTest {
     @Test
     public void last() {
         iotService.setToken();
-        String date = "2025-07-11";
+        String date = "2025-07-29";
         LocalDate localDate = LocalDate.parse(date);
 //        dayService.day(localDate);
 //        dayService.day(LocalDate.parse("2025-02-23"));
@@ -55,7 +55,7 @@ public class TaskTest {
 //        }
 ////        empCalcService.calc(DateUtils.toDate(localDate));
         LocalDateTime ldt = LocalDateTime.of(localDate, LocalTime.MIN);
-        for (int i = 23; i < 24; i++) {
+        for (int i = 7; i < 10; i++) {
             LocalDateTime tt = ldt.plusHours(i);
             System.err.println(tt.toLocalDate().toString() + tt.getHour());
             calcHourService.calc(tt.toLocalDate().toString(), tt.getHour());
@@ -69,8 +69,8 @@ public class TaskTest {
     @Test
     public void test() {
         iotService.setToken();
-        String st = "2025-03-16";
-        String ed = "2025-03-16";
+        String st = "2025-07-28";
+        String ed = "2025-07-28";
         LocalDate localDate = LocalDate.parse(st);
         LocalDate endDate = LocalDate.parse(ed);
         LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(7);

jjt-biz/src/main/java/com/jjt/calc/service/impl/TwinCalcHourServiceImpl.java

@@ -189,6 +189,9 @@ public class TwinCalcHourServiceImpl implements ITwinCalcHourService {
         search.setOnline("1");
         //TODO 临时设置单个设备，上线需取消
 //        search.setDeviceId(175L);
+//        Map<String,Object> params = new HashMap<>();
+//        params.put("ids", new int[]{137, 138});
+//        search.setParams(params);
         List<TwinDevice> list = deviceService.selectTwinDeviceList(search);
         List<TwinDevice> errList = exec(list, start, end);
         //重试2次

jjt-biz/src/main/resources/mapper/biz/TwinDeviceMapper.xml

@@ -34,6 +34,12 @@ 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.ids != null and params.ids !=''">
+                and DEVICE_ID in
+                <foreach item="id" collection="params.ids" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>