Merge remote-tracking branch 'origin/master'

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/CqCbdDeviceImpl.java

@@ -375,8 +375,8 @@ public class CqCbdDeviceImpl extends DeviceAbstractImpl implements ICbdDevice {
         if (!isCbd) {
             return "暂不处理吸虫塔设备";
         }
-
-        jsonObject = makeTestData(jsonObject);
+        // 测试数据
+//        jsonObject = makeTestData(jsonObject);
 
         String cbdimgAddr = jsonObject.getString("Image");
         if (StringUtils.isEmpty(cbdimgAddr)) {

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfQxzDeviceImpl.java

@@ -394,25 +394,16 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
 
         iIotDeviceService.updateIotDevice(newIotDevice);
         // 主动进行查询，以确保不是误判离线
+
         if("offline".equalsIgnoreCase(cmd)){
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(2*1000);
-                    }catch (InterruptedException e){
-                        e.printStackTrace();
-                    }
-                    //主动进行查询，以确保不是误判离线
-                    log.info("【YFQXZ】主动进行查询，以确保不是误判离线" + iotDeviceOld);
-                    YfQxzReqMsg reqMsg = new YfQxzReqMsg();
-                    JSONObject jobjParams = new JSONObject();
-                    jobjParams.put("type","data");
-                    reqMsg.setExt(jobjParams);
-
-                    publishMsg(iotDeviceOld, reqMsg);
-                }
-            }).start();
+            //主动进行查询，以确保不是误判离线
+            log.info("【YFQXZ】主动进行查询，以确保不是误判离线" + iotDeviceOld);
+            YfQxzReqMsg reqMsg = new YfQxzReqMsg();
+            JSONObject jobjParams = new JSONObject();
+            jobjParams.put("type","data");
+            reqMsg.setExt(jobjParams);
+
+            publishMsg(iotDeviceOld, reqMsg);
         }
     }