新增 爱迪智农管式墒情型号

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

@@ -86,42 +86,12 @@ public class IotDeviceDictConst {
      */
     public static final String TYPE_ZHAO_HE_SFJ = "103";
 
-    /**
-     * 爱迪智农-管式墒情
-     */
-    public static final String TYPE_ADZN_GSSQ = "15";
 
     /**
      * 云飞-性诱测报灯2.0
      */
     public static final String TYPE_YF_XYCB_2 = "1700";
 
-    /**
-     * 黄氏生物水稻稻瘟病预警监测
-     */
-    public static final String TYPE_HS_YBQ_DWB = "HS_YBQ_DWB00001";
-
-    /**
-     * 黄氏生物小麦赤霉病预警监测
-     */
-    public static final String TYPE_HS_YBQ_CMB = "HS_YBQ_CMB00001";
-
-
-    /**
-     * 黄氏生物玉米大斑病预警监测
-     */
-    public static final String TYPE_HS_YBQ_DBB = "HS_YBQ_DBB00001";
-
-
-    /**
-     * 黄氏生物小小麦白粉病预警监测
-     */
-    public static final String TYPE_HS_YBQ_BFB = "HS_YBQ_BFB00001";
-
-    /**
-     * 黄氏生物小麦条锈病预警监测
-     */
-    public static final String TYPE_HS_YBQ_TXB = "HS_YBQ_TXB00001";
 
 
     /**
@@ -230,6 +200,51 @@ public class IotDeviceDictConst {
      * */
     public static final String TYPE_JSY_ST_QF = "9001";
 
+
+
+    /*
+     ***********************************************************
+                             墒情站
+     ***********************************************************
+     */
+    /**
+     * 云飞-墒情站
+     */
+    public static final String TYPE_YF_SQZ = "SQZ00001";
+    /**
+     * XPH mqtt墒情站
+     * 新普惠MQTT气象站和墒情站使用的是云飞气象和墒情
+     */
+    public static final String TYPE_XPH_YF_SQZ = "SQZ00002";
+    /**
+     * 爱迪智农-管式墒情
+     */
+    public static final String TYPE_ADZN_GSSQ = "SQZ00003";
+
+
+
+    /*
+     ***********************************************************
+                              气象站
+     ***********************************************************
+     */
+    /**
+     * 云飞环境监测
+     */
+    public static final String TYPE_YF_QXZ = "QXZ00001";
+    /**
+     * XPH mqt气象站
+     * 新普惠MQTT气象站和墒情站使用的是云飞气象和墒情
+     */
+    public static final String TYPE_XPH_YF_QXZ = "QXZ00002";
+
+
+    /*
+     ***********************************************************
+                              测报灯
+     ***********************************************************
+     */
+
     /**
      * 云飞普通测报灯
      */
@@ -245,44 +260,70 @@ public class IotDeviceDictConst {
      */
     public static final String TYPE_YF_GKCBD = "CQCBD00003";
 
+
+
+    /*
+     ***********************************************************
+                              杀虫灯
+     ***********************************************************
+     */
     /**
-     * 云飞-墒情站
+     * 云飞-普通杀虫灯
      */
-    public static final String TYPE_YF_SQZ = "SQZ00001";
+    public static final String TYPE_YF_SCD = "SCD00001";
 
     /**
-     * 云飞环境监测
+     * 云飞-风吸式杀虫灯
      */
-    public static final String TYPE_YF_QXZ = "QXZ00001";
+    public static final String TYPE_YF_FXSSCD = "SCD00002";
+
+    /**
+     * 云飞-景观式杀虫灯
+     */
+    public static final String TYPE_YF_JGFXSSCD = "SCD00003";
+
+
 
+    /*
+     ***********************************************************
+                              监控设备
+     ***********************************************************
+     */
     /**
      * 萤石云监控设备
      */
     public static final String TYPE_EZVIZ_JKSB = "JK00001";
 
+
+    /*
+     ***********************************************************
+                               诱捕器
+     ***********************************************************
+     */
+
     /**
-     * XPH mqt气象站
-     * 新普惠MQTT气象站和墒情站使用的是云飞气象和墒情
+     * 黄氏生物水稻稻瘟病预警监测
      */
-    public static final String TYPE_XPH_YF_QXZ = "QXZ00002";
+    public static final String TYPE_HS_YBQ_DWB = "HS_YBQ_DWB00001";
 
     /**
-     * XPH mqtt墒情站
+     * 黄氏生物小麦赤霉病预警监测
      */
-    public static final String TYPE_XPH_YF_SQZ = "SQZ00002";
+    public static final String TYPE_HS_YBQ_CMB = "HS_YBQ_CMB00001";
 
     /**
-     * 云飞-普通杀虫灯
+     * 黄氏生物玉米大斑病预警监测
      */
-    public static final String TYPE_YF_SCD = "SCD00001";
+    public static final String TYPE_HS_YBQ_DBB = "HS_YBQ_DBB00001";
+
 
     /**
-     * 云飞-风吸式杀虫灯
+     * 黄氏生物小小麦白粉病预警监测
      */
-    public static final String TYPE_YF_FXSSCD = "SCD00002";
+    public static final String TYPE_HS_YBQ_BFB = "HS_YBQ_BFB00001";
 
     /**
-     * 云飞-景观式杀虫灯
+     * 黄氏生物小麦条锈病预警监测
      */
-    public static final String TYPE_YF_JGFXSSCD = "SCD00003";
+    public static final String TYPE_HS_YBQ_TXB = "HS_YBQ_TXB00001";
 }

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

@@ -16,20 +16,16 @@ import java.util.List;
  */
 public enum IotDeviceDictEnum {
 
-    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.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),
+
+
     TYPE_YF_BZY(IotDeviceDictConst.TYPE_YF_BZY, "云飞孢子仪", ServiceNameConst.SERVICE_YF_BZY, IotDeviceTypeLv1Enum.BZY),
     TYPE_YF_SY3(IotDeviceDictConst.TYPE_YF_SY3, "云飞性诱3.0"),
     TYPE_YF_SY2(IotDeviceDictConst.TYPE_YF_SY2, "云飞性诱2.0"),
-    TYPE_ADZN_GSSQ(IotDeviceDictConst.TYPE_ADZN_GSSQ, "爱迪智农-管式墒情", ServiceNameConst.SERVICE_ADZN_GSSQ, IotDeviceTypeLv1Enum.GSSQ),
-    TYPE_HS_YBQ_DWB(IotDeviceDictConst.TYPE_HS_YBQ_DWB, "黄氏生物水稻稻瘟病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_DWB),
-    TYPE_HS_YBQ_CMB(IotDeviceDictConst.TYPE_HS_YBQ_CMB, "黄氏生物小麦赤霉病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_CMB),
-    TYPE_HS_YBQ_DBB(IotDeviceDictConst.TYPE_HS_YBQ_DBB, "黄氏生物玉米大斑病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_DBB),
-    TYPE_HS_YBQ_BFB(IotDeviceDictConst.TYPE_HS_YBQ_BFB, "黄氏生物小麦白粉病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_BFB),
-    TYPE_HS_YBQ_TXB(IotDeviceDictConst.TYPE_HS_YBQ_TXB, "黄氏生物小麦条锈病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_TXB),
+
+
+
+
+
 
 
 
@@ -45,10 +41,10 @@ public enum IotDeviceDictEnum {
     TYPE_XMZN_SQZ(IotDeviceDictConst.TYPE_XMZN_SQZ, "小马智农-墒情站", ServiceNameConst.SERVICE_XMZN_ZNDP, IotDeviceTypeLv1Enum.SQZ),
     TYPE_RT_XJ(IotDeviceDictConst.TYPE_RT_XJ, "睿瞳相机", IotDeviceTypeLv1Enum.WH_XJ),
     TYPE_ZHAO_HE_SFJ(IotDeviceDictConst.TYPE_ZHAO_HE_SFJ, "兆赫水肥机", ServiceNameConst.SERVICE_ZHAO_HE_SF, IotDeviceTypeLv1Enum.SFJ),
-    TYPE_YF_SQZ(IotDeviceDictConst.TYPE_YF_SQZ, "云飞-墒情站", ServiceNameConst.SERVICE_YF_SQZ, IotDeviceTypeLv1Enum.SQZ),
+
 
     TYPE_YF_XYCB_2(IotDeviceDictConst.TYPE_YF_XYCB_2, "云飞-性诱测报灯2.0", ServiceNameConst.SERVICE_YF_XYCB_2, IotDeviceTypeLv1Enum.XYCB),
-    TYPE_XPH_GSSQ(IotDeviceDictConst.TYPE_XPH_GSSQ, "新浦会管式墒情", ServiceNameConst.SERVICE_XPH_GSSQ, IotDeviceTypeLv1Enum.GSSQ),
+
     TYPE_XPH_SZZX_JC(IotDeviceDictConst.TYPE_XPH_SZZX_JC, "新浦会水质在线监测站", ServiceNameConst.SERVICE_XPH_SZZX_JC, IotDeviceTypeLv1Enum.JZC_SZ_ZX),
     TYPE_XPH_LDSW_JC(IotDeviceDictConst.TYPE_XPH_LDSW_JC, "新浦会雷达水位监测站", ServiceNameConst.SERVICE_XPH_LDSW_JC, IotDeviceTypeLv1Enum.JZC_LD_SW),
     TYPE_DAHUA_DEVICE(IotDeviceDictConst.TYPE_DAHUA_DEVICE, "大华球形摄像机", ServiceNameConst.SERVICE_DAHUA_ICC, IotDeviceTypeLv1Enum.JKSB),
@@ -73,11 +69,39 @@ public enum IotDeviceDictEnum {
     TYPE_XPH_GP_QXZ(IotDeviceDictConst.TYPE_XPH_GP_QXZ, "新普惠光谱气象站", ServiceNameConst.SERVICE_XPH_GP_QXZ, IotDeviceTypeLv1Enum.QXZ),
     TYPE_YR_SF_SERVICE(IotDeviceDictConst.TYPE_YR_SF, "源润水肥机", ServiceNameConst.SERVICE_YR_SF_SERVICE, IotDeviceTypeLv1Enum.YR_SF),
     TYPE_JSY_ST_QF(IotDeviceDictConst.TYPE_JSY_ST_QF, "及时雨三通球阀", ServiceNameConst.SERVICE_JSY_ST_QF, IotDeviceTypeLv1Enum.QF),
-    TYPE_XPH_YF_QXZ(IotDeviceDictConst.TYPE_XPH_YF_QXZ, "新普惠-云飞-气象站", ServiceNameConst.SERVICE_XPH_YF_QXZ, IotDeviceTypeLv1Enum.QXZ),
-    TYPE_XPH_YF_SQZ(IotDeviceDictConst.TYPE_XPH_YF_SQZ, "新普惠-云飞-墒情站", ServiceNameConst.SERVICE_XPH_YF_SQZ, IotDeviceTypeLv1Enum.SQZ),
+    TYPE_XPH_GSSQ(IotDeviceDictConst.TYPE_XPH_GSSQ, "新浦会管式墒情", ServiceNameConst.SERVICE_XPH_GSSQ, IotDeviceTypeLv1Enum.GSSQ),
+
+
+
+    /**
+     * 新版本的写道下面
+     */
+    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.CBD),
+    TYPE_YF_SDCBD(IotDeviceDictConst.TYPE_YF_SDCBD, "水稻测报灯", ServiceNameConst.SERVICE_YF_SDCBD, IotDeviceTypeLv1Enum.CBD),
+
     TYPE_YF_SCD(IotDeviceDictConst.TYPE_YF_SCD, "云飞普通杀虫灯", ServiceNameConst.SERVICE_YF_SCD, IotDeviceTypeLv1Enum.SCD),
     TYPE_YF_FXSSCD(IotDeviceDictConst.TYPE_YF_FXSSCD, "云飞风吸式杀虫灯", ServiceNameConst.SERVICE_YF_FXSSCD, IotDeviceTypeLv1Enum.SCD),
-    TYPE_YF_JGFXSSCD(IotDeviceDictConst.TYPE_YF_JGFXSSCD, "云飞景观式杀虫灯", ServiceNameConst.SERVICE_YF_JGFXSSCD, IotDeviceTypeLv1Enum.SCD);
+    TYPE_YF_JGFXSSCD(IotDeviceDictConst.TYPE_YF_JGFXSSCD, "云飞景观式杀虫灯", ServiceNameConst.SERVICE_YF_JGFXSSCD, IotDeviceTypeLv1Enum.SCD),
+
+
+    TYPE_YF_QXZ(IotDeviceDictConst.TYPE_YF_QXZ, "云飞环境监测", ServiceNameConst.SERVICE_YF_QXZ, IotDeviceTypeLv1Enum.QXZ),
+    TYPE_XPH_YF_QXZ(IotDeviceDictConst.TYPE_XPH_YF_QXZ, "新普惠-云飞-气象站", ServiceNameConst.SERVICE_XPH_YF_QXZ, IotDeviceTypeLv1Enum.QXZ),
+
+
+    TYPE_YF_SQZ(IotDeviceDictConst.TYPE_YF_SQZ, "云飞-墒情站", ServiceNameConst.SERVICE_YF_SQZ, IotDeviceTypeLv1Enum.SQZ),
+    TYPE_XPH_YF_SQZ(IotDeviceDictConst.TYPE_XPH_YF_SQZ, "新普惠-云飞-墒情站", ServiceNameConst.SERVICE_XPH_YF_SQZ, IotDeviceTypeLv1Enum.SQZ),
+    TYPE_ADZN_GSSQ(IotDeviceDictConst.TYPE_ADZN_GSSQ, "爱迪智农-管式墒情", ServiceNameConst.SERVICE_ADZN_GSSQ, IotDeviceTypeLv1Enum.SQZ),
+
+
+    TYPE_YF_JKSB(IotDeviceDictConst.TYPE_EZVIZ_JKSB, "萤石云监控设备", ServiceNameConst.SERVICE_EZVIZ_MINITOR, IotDeviceTypeLv1Enum.JKSB),
+
+
+    TYPE_HS_YBQ_DWB(IotDeviceDictConst.TYPE_HS_YBQ_DWB, "黄氏生物水稻稻瘟病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_DWB),
+    TYPE_HS_YBQ_CMB(IotDeviceDictConst.TYPE_HS_YBQ_CMB, "黄氏生物小麦赤霉病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_CMB),
+    TYPE_HS_YBQ_DBB(IotDeviceDictConst.TYPE_HS_YBQ_DBB, "黄氏生物玉米大斑病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_DBB),
+    TYPE_HS_YBQ_BFB(IotDeviceDictConst.TYPE_HS_YBQ_BFB, "黄氏生物小麦白粉病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_BFB),
+    TYPE_HS_YBQ_TXB(IotDeviceDictConst.TYPE_HS_YBQ_TXB, "黄氏生物小麦条锈病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_TXB);
 
     private String code;
     private String name;