新增 性诱2.0配置

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

@@ -82,10 +82,7 @@ public class IotDeviceDictConst {
     public static final String TYPE_ZHAO_HE_SFJ = "103";
 
 
-    /**
-     * 云飞-性诱测报灯2.0
-     */
-    public static final String TYPE_YF_XYCB_2 = "1700";
+
 
 
 
@@ -196,7 +193,7 @@ public class IotDeviceDictConst {
      * */
     public static final String TYPE_JSY_ST_QF = "9001";
 
-
+    /* 新版值写下下面，上面的老版本的值不在使用 */
 
     /*
      ***********************************************************
@@ -360,4 +357,10 @@ public class IotDeviceDictConst {
      * 云飞-性诱测报灯III
      */
     public static final String TYPE_YF_XYCB_III = "XYCB00003";
+
+    /**
+     * 云飞-性诱测报灯2.0
+     * 宁录-性诱测报灯
+     */
+    public static final String TYPE_YF_XYCB_2 = "XYCB00004";
 }

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

@@ -42,7 +42,6 @@ public enum IotDeviceDictEnum {
     TYPE_ZHAO_HE_SFJ(IotDeviceDictConst.TYPE_ZHAO_HE_SFJ, "兆赫水肥机", ServiceNameConst.SERVICE_ZHAO_HE_SF, IotDeviceTypeLv1Enum.SFJ),
 
 
-    TYPE_YF_XYCB_2(IotDeviceDictConst.TYPE_YF_XYCB_2, "云飞-性诱测报灯2.0", ServiceNameConst.SERVICE_YF_XYCB_2, IotDeviceTypeLv1Enum.XYCB),
 
     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),
@@ -108,7 +107,9 @@ public enum IotDeviceDictEnum {
     TYPE_YF_L_BZY(IotDeviceDictConst.TYPE_YF_L_BZY, "云飞低端款孢子仪", ServiceNameConst.SERVICE_YF_BZY, IotDeviceTypeLv1Enum.BZY),
 
 
-    TYPE_YF_XYCB_III(IotDeviceDictConst.TYPE_YF_XYCB_III, "云飞-性诱测报灯III", ServiceNameConst.SERVICE_YF_XYCB_III, IotDeviceTypeLv1Enum.XYCB);
+    TYPE_YF_XYCB_III(IotDeviceDictConst.TYPE_YF_XYCB_III, "云飞-性诱测报灯III", ServiceNameConst.SERVICE_YF_XYCB_III, IotDeviceTypeLv1Enum.XYCB),
+    /**  宁录性诱测报灯 */
+    TYPE_YF_XYCB_2(IotDeviceDictConst.TYPE_YF_XYCB_2, "云飞-性诱测报灯2.0", ServiceNameConst.SERVICE_YF_XYCB_2, IotDeviceTypeLv1Enum.XYCB);
 
     private String code;
     private String name;

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

@@ -114,7 +114,8 @@ public class ServiceNameConst {
     public static final String SERVICE_XYCB = "XYCB-SERVICE";
 
     /**
-     * 云飞性诱测报灯2.0
+     * 云飞性诱测报灯2.0 不带拍照
+     * 宁录性诱测报
      */
     public static final String SERVICE_YF_XYCB_2 = "YF-XYCB-2-SERVICE";
 
@@ -193,9 +194,4 @@ public class ServiceNameConst {
      * 云飞吸虫塔设备
      * */
     public static final String SERVICE_YF_XCT = "YF_XCT_SERVICE";
-
-    /**
-     * 宁录性诱 不带拍照
-     */
-    public static final String SERVICE_NL_XYCB = "NL-XYCB-SERVICE";
 }

src/main/java/com/yunfeiyun/agmp/iot/common/constant/mqtt/IotMqttConstant.java

@@ -161,7 +161,8 @@ public class IotMqttConstant {
     }
 
     /**
-     * 云飞 性诱设备 topic
+     * 云飞 性诱2.0设备 topic
+     * 宁录性诱
      */
     public class YFXycb2Topic {