Explorar o código

新增 孢子仪设备类型

zhaiyifei hai 1 ano
pai
achega
fbac344630

+ 12 - 5
src/main/java/com/yunfeiyun/agmp/iot/common/constant/devicetype/IotDeviceDictConst.java

@@ -13,11 +13,6 @@ public class IotDeviceDictConst {
     public static final String TYPE_YF_XYCB = "4";
 
     /**
-     * 云飞孢子仪
-     */
-    public static final String TYPE_YF_BZY = "7";
-
-    /**
      * 云飞性诱3.0
      */
     public static final String TYPE_YF_SY3 = "8";
@@ -326,4 +321,16 @@ public class IotDeviceDictConst {
      * 黄氏生物小麦条锈病预警监测
      */
     public static final String TYPE_HS_YBQ_TXB = "HS_YBQ_TXB00001";
+
+
+    /*
+     ***********************************************************
+                               孢子仪
+     ***********************************************************
+     */
+
+    /**
+     * 云飞孢子仪
+     */
+    public static final String TYPE_YF_BZY = "BZY00001";
 }

+ 4 - 2
src/main/java/com/yunfeiyun/agmp/iot/common/constant/devicetype/IotDeviceDictEnum.java

@@ -18,7 +18,6 @@ public enum IotDeviceDictEnum {
 
 
 
-    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"),
 
@@ -101,7 +100,10 @@ public enum IotDeviceDictEnum {
     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);
+    TYPE_HS_YBQ_TXB(IotDeviceDictConst.TYPE_HS_YBQ_TXB, "黄氏生物小麦条锈病预警监测", ServiceNameConst.SERVICE_HS_YBQ, IotDeviceTypeLv1Enum.YBQ_TXB),
+
+
+    TYPE_YF_BZY(IotDeviceDictConst.TYPE_YF_BZY, "云飞孢子仪", ServiceNameConst.SERVICE_YF_BZY, IotDeviceTypeLv1Enum.BZY);
 
     private String code;
     private String name;