修改数采定时任务

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

@@ -30,8 +30,8 @@ public class TdCronJob implements JobHandler {
     private IotDeviceMapper iotDeviceMapper;
     @Autowired
     private TDDeviceMapper deviceMapper;
-    @Autowired
-    private StringRedisTemplate redisTemplate;
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
 
     @Override
     @TenantIgnore
@@ -49,14 +49,13 @@ public class TdCronJob implements JobHandler {
         for (IotDeviceDO device : devices) {
             String deviceCode = device.getDeviceCode();
             if ("YF6660388".equals(deviceCode)) {
-                System.out.println("----------------"+deviceCode);
+                System.out.println("************************");
             }
             allDevice.stream().filter(e -> e.getSerialNumber().equals(deviceCode)).findFirst().ifPresent(e -> {
                 device.setYfDeviceId(e.getDeviceId());
 //                Integer i = deviceMapper.tableIfExist(e.getSerialNumber().toLowerCase());
                 if (allTableNames.contains("device_"+e.getSerialNumber().toLowerCase())) {//如果存在表
-                    String redisKey = "TSLV:"+e.getProductId()+"_"+e.getSerialNumber();
-                    Map<Object, Object> hashAll = redisTemplate.opsForHash().entries(redisKey);
+                    Map<Object, Object> hashAll = stringRedisTemplate.opsForHash().entries("TSLV:"+e.getProductId()+"_"+e.getSerialNumber());
 
                     Map<String, String> result = new HashMap<>();
                     String timestamp = "";
@@ -118,17 +117,17 @@ public class TdCronJob implements JobHandler {
                         device.setIfInline(4);
                     }
 
-                    Object lat = redisTemplate.opsForHash().get("TSLV:" + device.getDeviceCode(), "lat");
+                    Object lat = stringRedisTemplate.opsForHash().get("TSLV:" + device.getDeviceCode(), "lat");
                     if (Objects.nonNull(lat)) {
                         JSONObject jsonObject = JSON.parseObject(lat.toString());
                         device.setLat(Double.valueOf((String) jsonObject.get("value")));
                     }
-                    Object lng = redisTemplate.opsForHash().get("TSLV:" + device.getDeviceCode(), "lng");
+                    Object lng = stringRedisTemplate.opsForHash().get("TSLV:" + device.getDeviceCode(), "lng");
                     if (Objects.nonNull(lng)) {
                         JSONObject jsonObject = JSON.parseObject(lng.toString());
                         device.setLng(Double.valueOf((String) jsonObject.get("value")));
                     }
-                    Object online = redisTemplate.opsForHash().get("TSLV:" + device.getDeviceCode(), "online");
+                    Object online = stringRedisTemplate.opsForHash().get("TSLV:" + device.getDeviceCode(), "online");
                     if (Objects.nonNull(online)) {
                         JSONObject jsonObject = JSON.parseObject(online.toString());
                         String value = String.valueOf(jsonObject.get("value"));