新增 性诱测报III设备类型

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

@@ -333,4 +333,20 @@ public class IotDeviceDictConst {
      * 云飞孢子仪
      */
     public static final String TYPE_YF_BZY = "BZY00001";
+
+    /**
+     * 低端款孢子仪
+     * */
+    public static final String TYPE_YF_L_BZY ="BZY00002";
+
+
+    /*
+     ***********************************************************
+                               性诱设备
+     ***********************************************************
+     */
+    /**
+     * 云飞-性诱测报灯III
+     */
+    public static final String TYPE_YF_XYCB_III = "XYCB00003";
 }

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

@@ -103,7 +103,11 @@ public enum IotDeviceDictEnum {
     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);
+    TYPE_YF_BZY(IotDeviceDictConst.TYPE_YF_BZY, "云飞孢子仪", ServiceNameConst.SERVICE_YF_BZY, IotDeviceTypeLv1Enum.BZY),
+    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);
 
     private String code;
     private String name;

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

@@ -183,4 +183,9 @@ public class ServiceNameConst {
     public static final String SERVICE_OB_SZ ="OB_SZ";
 
     public static final String SERVICE_JSY_ST_QF = "JSY_ST_QF";
+
+    /**
+     * 云飞性诱测报灯III 不带拍照
+     */
+    public static final String SERVICE_YF_XYCB_III = "YF-XYCB-III-SERVICE";
 }

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

@@ -218,6 +218,12 @@ public class IotMqttConstant {
         public final static String TOPIC_YR_SF_CHANGE_PREFIX =  "/hbyr/sf/change/";
     }
 
+    public class YFXycbIIITopic {
+        public final static String TOPIC_XYCB_III_REPORT_PREFIX = "/yfkj/xycb/c2s/";
+        public final static String TOPIC_XYCB_III_CMD_PREFIX = "/yfkj/xycb/s2c/";
+
+    }
+
     public static String getReportTopicByDevtype(String devtypeBid){
         String topic = null;
         if(IotDeviceDictConst.TYPE_YF_SCD.equals(devtypeBid)){
@@ -238,6 +244,7 @@ public class IotMqttConstant {
                 topic = YFScdTopic.TOPIC_SCD_REPORT_PREFIX;
                 break;
             case IotDeviceDictConst.TYPE_YF_BZY:
+            case IotDeviceDictConst.TYPE_YF_L_BZY:
                 topic = YFBzyTopic.TOPIC_BZY_REPORT_PREFIX;
                 break;
             case IotDeviceDictConst.TYPE_YF_QXZ:
@@ -257,6 +264,9 @@ public class IotMqttConstant {
             case IotDeviceDictConst.TYPE_YR_SF:
                 topic = YrSfTopic.TOPIC_YR_SF_REPORT_PREFIX;
                 break;
+            case IotDeviceDictConst.TYPE_YF_XYCB_III:
+                topic = YFXycbIIITopic.TOPIC_XYCB_III_REPORT_PREFIX;
+                break;
         }
         return topic;
     }

src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotYfXycbIIIdata.java

@@ -0,0 +1,28 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * mongo
+ * 性诱测报灯2.0
+ */
+@Data
+@TableName("IotYfXycbIIIdata")
+public class IotYfXycbIIIdata extends IotBaseEntity{
+
+    private String id;
+
+    private String cId;
+
+    private String xycbdataBid;
+
+    private String devBid;
+
+    private JSONObject xycbdataContent;
+
+    private String xycbdataCreatedDate;
+
+}