新增 获取高空测报灯，水稻测报灯设备列表接口

src/main/java/com/yunfeiyun/agmp/iot/common/constant/devicetype/IotDeviceDictConst.java

@@ -6,15 +6,6 @@ package com.yunfeiyun.agmp.iot.common.constant.devicetype;
  * @author zhangn
  */
 public class IotDeviceDictConst {
-    /**
-     * 云飞高空测报灯
-     */
-    public static final String TYPE_YF_GKCBD = "300";
-
-    /**
-     * 云飞水稻测报灯
-     */
-    public static final String TYPE_YF_SDCBD = "104";
 
     /**
      * 云飞性诱测报
@@ -255,11 +246,21 @@ public class IotDeviceDictConst {
      */
     public static final String TYPE_YF_SCD = "SCD00001";
     /**
-     * 云飞测报灯
+     * 云飞普通测报灯
      */
     public static final String TYPE_YF_CBD = "CQCBD00001";
 
     /**
+     * 云飞水稻测报灯
+     */
+    public static final String TYPE_YF_SDCBD = "CQCBD00002";
+
+    /**
+     * 云飞高空测报灯
+     */
+    public static final String TYPE_YF_GKCBD = "CQCBD00003";
+
+    /**
      * 云飞-墒情站
      */
     public static final String TYPE_YF_SQZ = "SQZ00001";

src/main/java/com/yunfeiyun/agmp/iot/common/constant/devicetype/IotDeviceDictEnum.java

@@ -14,7 +14,7 @@ import com.yunfeiyun.agmp.iot.common.service.TypeCoreService;
 public enum IotDeviceDictEnum {
     TYPE_YF_SCD(IotDeviceDictConst.TYPE_YF_SCD, "云飞杀虫灯", ServiceNameConst.SERVICE_YF_SCD, IotDeviceTypeLv1Enum.SCD),
     TYPE_YF_CBD(IotDeviceDictConst.TYPE_YF_CBD, "普通测报灯", ServiceNameConst.SERVICE_YF_CBD, IotDeviceTypeLv1Enum.CBD),
-    TYPE_YF_GKCBD(IotDeviceDictConst.TYPE_YF_GKCBD, "高空测报灯", ServiceNameConst.SERVICE_YF_GKCBD, IotDeviceTypeLv1Enum.GKCBD),
+    TYPE_YF_GKCBD(IotDeviceDictConst.TYPE_YF_GKCBD, "高空测报灯", ServiceNameConst.SERVICE_YF_GKCBD, IotDeviceTypeLv1Enum.CBD),
     TYPE_YF_SDCBD(IotDeviceDictConst.TYPE_YF_SDCBD, "水稻测报灯", ServiceNameConst.SERVICE_YF_SDCBD, IotDeviceTypeLv1Enum.CBD),
     TYPE_YF_QXZ(IotDeviceDictConst.TYPE_YF_QXZ, "云飞环境监测", ServiceNameConst.SERVICE_YF_QXZ, IotDeviceTypeLv1Enum.QXZ),
     TYPE_YF_JKSB(IotDeviceDictConst.TYPE_EZVIZ_JKSB, "萤石云监控设备", ServiceNameConst.SERVICE_EZVIZ_MINITOR, IotDeviceTypeLv1Enum.JKSB),

src/main/java/com/yunfeiyun/agmp/iot/common/constant/devicetype/ServiceNameConst.java

@@ -6,6 +6,9 @@ package com.yunfeiyun.agmp.iot.common.constant.devicetype;
 public class ServiceNameConst {
 
     public static final String SERVICE_YF_CBD = "YF-CBD-SERVICE";
+    /**
+     * 高空测报灯
+     */
     public static final String SERVICE_YF_GKCBD = SERVICE_YF_CBD;
     /**
      * 水稻模型测报灯