新增杀虫灯设备类型

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

@@ -91,17 +91,6 @@ public class IotDeviceDictConst {
      */
     public static final String TYPE_ADZN_GSSQ = "15";
 
-
-    /**
-     * 云飞-风吸式杀虫灯
-     */
-    public static final String TYPE_YF_FXSSCD = "20";
-
-    /**
-     * 云飞-景观风吸式杀虫灯
-     */
-    public static final String TYPE_YF_JGFXSSCD = "21";
-
     /**
      * 云飞-性诱测报灯2.0
      */
@@ -242,10 +231,6 @@ public class IotDeviceDictConst {
     public static final String TYPE_JSY_ST_QF = "9001";
 
     /**
-     * 云飞杀虫灯
-     */
-    public static final String TYPE_YF_SCD = "SCD00001";
-    /**
      * 云飞普通测报灯
      */
     public static final String TYPE_YF_CBD = "CQCBD00001";
@@ -285,4 +270,19 @@ public class IotDeviceDictConst {
      * XPH mqtt墒情站
      */
     public static final String TYPE_XPH_YF_SQZ = "SQZ00002";
+
+    /**
+     * 云飞-普通杀虫灯
+     */
+    public static final String TYPE_YF_SCD = "SCD00001";
+
+    /**
+     * 云飞-风吸式杀虫灯
+     */
+    public static final String TYPE_YF_FXSSCD = "SCD00002";
+
+    /**
+     * 云飞-景观风吸式杀虫灯
+     */
+    public static final String TYPE_YF_JGFXSSCD = "SCD00003";
 }

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

@@ -12,7 +12,7 @@ import com.yunfeiyun.agmp.iot.common.service.TypeCoreService;
  * @author zhangn
  */
 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.CBD),
     TYPE_YF_SDCBD(IotDeviceDictConst.TYPE_YF_SDCBD, "水稻测报灯", ServiceNameConst.SERVICE_YF_SDCBD, IotDeviceTypeLv1Enum.CBD),
@@ -42,8 +42,6 @@ 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_FXSSCD(IotDeviceDictConst.TYPE_YF_FXSSCD, "云飞风吸式杀虫灯", ServiceNameConst.SERVICE_YF_FXSSCD, IotDeviceTypeLv1Enum.FXSSCD),
-    TYPE_YF_JGFXSSCD(IotDeviceDictConst.TYPE_YF_JGFXSSCD, "云飞景观风吸式杀虫灯", ServiceNameConst.SERVICE_YF_JGFXSSCD, IotDeviceTypeLv1Enum.JGFXSSCD),
     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),
@@ -73,7 +71,10 @@ public enum IotDeviceDictEnum {
     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_YF_SQZ(IotDeviceDictConst.TYPE_XPH_YF_SQZ, "新普惠-云飞-墒情站", ServiceNameConst.SERVICE_XPH_YF_SQZ, IotDeviceTypeLv1Enum.SQZ),
+    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);
 
     private String code;
     private String name;

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

@@ -15,8 +15,17 @@ public class ServiceNameConst {
      */
     public static final String SERVICE_YF_SDCBD = SERVICE_YF_CBD;
 
+    /**
+     * 云飞普通杀虫灯
+     */
     public static final String SERVICE_YF_SCD = "YF-SCD-SERVICE";
+    /**
+     * 云飞风吸式杀虫灯
+     */
     public static final String SERVICE_YF_FXSSCD = SERVICE_YF_SCD;
+    /**
+     * 云飞景观式杀虫灯
+     */
     public static final String SERVICE_YF_JGFXSSCD = SERVICE_YF_SCD;
     /**
      * 云飞孢子仪