Merge remote-tracking branch 'origin/develop' into develop

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

@@ -371,11 +371,19 @@ public class  IYfXctDeviceImpl extends DeviceAbstractImpl implements IYfXctDevic
         if(!transAfterData.isEmpty()){
             label = transAfterData.toJSONString();
         }
-        dataJson.put("label", label);
+
         for(int i = 1;i<=3;i++){
             cbdrecogResult = cbdrecogResult.replaceFirst(i+",","xct"+i+",");
         }
         cbdrecogResult = cbdrecogResult.replaceAll("4,\\d+#|#4,\\d+","");
+
+        if(StringUtils.isEmpty(label) || StringUtils.isEmpty(cbdrecogResult)){
+            label = "";
+            cbdrecogResult = "";
+            totalPestNum = 0;
+        }
+
+        dataJson.put("label", label);
         dataJson.put("return_string",cbdrecogResult);
         dataJson.put("Result_c", totalPestNum);
     }

src/main/java/com/yunfeiyun/agmp/iots/task/IotStatusService.java

@@ -7,7 +7,6 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.model.device.IotDeviceStatusResVo;
 import com.yunfeiyun.agmp.iots.core.manager.ConnectionManager;
-import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceconfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -48,13 +47,22 @@ public class IotStatusService {
         validateDeviceType.add(IotDeviceDictConst.TYPE_YF_SCD);// 云飞杀虫灯
         validateDeviceType.add(IotDeviceDictConst.TYPE_YF_SQZ);// 云飞墒情站
         validateDeviceType.add(IotDeviceDictConst.TYPE_YF_QXZ);// 云飞环境监测
+        validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_YF_GSSQ);// 新浦会管式墒情
+        validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_YF_SQZ);// 新浦会云飞墒情站
+        validateDeviceType.add(IotDeviceDictConst.TYPE_ADZN_GSSQ);// 爱迪智农管式墒情
+        validateDeviceType.add(IotDeviceDictConst.TYPE_YF_XYCB_2);// 性诱测报2.0
+        validateDeviceType.add(IotDeviceDictConst.TYPE_YF_XYCB_III);// 云飞-性诱测报灯III
+        validateDeviceType.add(IotDeviceDictConst.TYPE_ZJSF_XYCB);// 中捷四方性诱
+        validateDeviceType.add(IotDeviceDictConst.TYPE_YF_XCT);// 云飞吸虫塔
+
+
 
         //validateDeviceType.add(IotDeviceDictConst.TYPE_ZHAO_HE_SFJ);// 赵赫水肥机
-        //validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_GSSQ);// 新浦会管式墒情
+
         //validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_LDSW_JC);// 新浦会雷达水位监测
         //validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_SZZX_JC);// 新浦会水质在线监测
         //validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_WSHJ_JC);// 新浦会温室环境监测
-        //validateDeviceType.add(IotDeviceDictConst.TYPE_YF_XYCB_2);// 性诱测报2.0
+
         //validateDeviceType.add(IotDeviceDictConst.TYPE_YF_GXZW);// 根系作物
         //validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_TRSH_CL);// 新普惠土壤水势
         //validateDeviceType.add(IotDeviceDictConst.TYPE_XPH_WSKZ);// 新浦会温室环境控制
@@ -116,13 +124,13 @@ public class IotStatusService {
                     String devName = iotDeviceStatusResVo.getDevName();
                     String devBid = iotDeviceStatusResVo.getDevBid();
                     String devStatus = iotDeviceStatusResVo.getDevStatus();
-                    // 检查时间上报间隔是否异常，30分钟没有，则异常
+                    // 检查时间上报间隔是否异常，60分钟没有，则异常
                     if (!validateTime(updateTime, 60)) {
                         log.info("【设备检测】【正常】：设备：{} {} 上次时间：{}", iotDeviceStatusResVo.getDevName(), iotDeviceStatusResVo.getDevCode(), updateTime);
                         return;
                     }
                     // 1. 当前在线的进行检查；
-                    if (devStatus.equals("1")) {
+                    if ("1".equals(devStatus)) {
                         // 更新状态
                         IotDevice iotDevice = new IotDevice();
                         iotDevice.setDevCode(iotDeviceStatusResVo.getDevCode());