소스 검색

qhse体系证书查询

Zimo 2 달 전
부모
커밋
5445f350b2

+ 5 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/TDDeviceMapper.java

@@ -36,8 +36,11 @@ public interface TDDeviceMapper extends BaseMapperX<TDDeviceDO> {
     List<DeviceVO> selectNew(@Param("deviceName") String tableName);
 
 
-    @Select("SELECT LAST(ts) as ts FROM iot_log.device_${deviceName} where identity not in ('lng','lat','today_distance','distance','todayoil','totaloil','online','oil1','oil2','oil3'," +
-            "'oil4','vehicle_name') ")
+//    @Select("SELECT LAST(ts) as ts FROM iot_log.device_${deviceName} where identity not in ('lng','lat','today_distance','distance','todayoil','totaloil','online','oil1','oil2','oil3'," +
+//            "'oil4','vehicle_name') ")
+    @Select("SELECT ts FROM iot_log.device_${deviceName} " +
+        "where identity not in ('lng','lat','today_distance','distance','todayoil','totaloil','online','oil1','oil2','oil3','oil4','vehicle_name') " +
+        "ORDER BY ts DESC LIMIT 1")
     @DS("tdengine")
     @TenantIgnore
     List<DeviceVO> selectLastTime(@Param("deviceName") String tableName);

+ 4 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/TdCronJob.java

@@ -46,6 +46,7 @@ public class TdCronJob implements JobHandler {
             codes.add(d.getSerialNumber());
         });
         List<IotDeviceDO> devices = iotDeviceMapper.selectByCodeIn(codes);
+        List<IotDeviceDO> deviceDOS = new ArrayList<>();
         for (IotDeviceDO device : devices) {
             String deviceCode = device.getDeviceCode();
             allDevice.stream().filter(e -> e.getSerialNumber().equals(deviceCode)).findFirst().ifPresent(e -> {
@@ -103,10 +104,11 @@ public class TdCronJob implements JobHandler {
                             device.setIfInline(4);
                         }
                     }
-                iotDeviceMapper.updateTdCron(device);
+//                iotDeviceMapper.updateTdCron(device);
+                deviceDOS.add(device);
             });
         }
-//        iotDeviceMapper.updateBatch(devices);
+        iotDeviceMapper.updateBatch(deviceDOS);
         return "";
     }