新增 新普惠气象墒情物联网设备功能对接

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

@@ -7,15 +7,6 @@ package com.yunfeiyun.agmp.iot.common.constant.devicetype;
  */
 public class IotDeviceDictConst {
     /**
-     * 云飞杀虫灯
-     */
-    public static final String TYPE_YF_SCD = "SCD00001";
-    /**
-     * 云飞测报灯
-     */
-    public static final String TYPE_YF_CBD = "CQCBD00001";
-
-    /**
      * 云飞高空测报灯
      */
     public static final String TYPE_YF_GKCBD = "300";
@@ -31,15 +22,6 @@ public class IotDeviceDictConst {
     public static final String TYPE_YF_XYCB = "4";
 
     /**
-     * 云飞环境监测
-     */
-    public static final String TYPE_YF_QXZ = "QXZ00001";
-
-    /**
-     * 萤石云监控设备
-     */
-    public static final String TYPE_EZVIZ_JKSB = "JK00001";
-    /**
      * 云飞孢子仪
      */
     public static final String TYPE_YF_BZY = "7";
@@ -118,10 +100,6 @@ public class IotDeviceDictConst {
      */
     public static final String TYPE_ADZN_GSSQ = "15";
 
-    /**
-     * 云飞-墒情站
-     */
-    public static final String TYPE_YF_SQZ = "SQZ00001";
 
     /**
      * 云飞-风吸式杀虫灯
@@ -271,4 +249,39 @@ 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";
+
+    /**
+     * 云飞-墒情站
+     */
+    public static final String TYPE_YF_SQZ = "SQZ00001";
+
+    /**
+     * 云飞环境监测
+     */
+    public static final String TYPE_YF_QXZ = "QXZ00001";
+
+    /**
+     * 萤石云监控设备
+     */
+    public static final String TYPE_EZVIZ_JKSB = "JK00001";
+
+    /**
+     * XPH mqt气象站
+     * 新普惠MQTT气象站和墒情站使用的是云飞气象和墒情
+     */
+    public static final String TYPE_XPH_YF_QXZ = "QXZ00002";
+
+    /**
+     * XPH mqtt墒情站
+     */
+    public static final String TYPE_XPH_YF_SQZ = "SQZ00002";
 }

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

@@ -69,7 +69,9 @@ public enum IotDeviceDictEnum {
     TYPE_HPF_WSMJ_ZNKG(IotDeviceDictConst.TYPE_HPF_WSMJ_ZNKG, "海普发温室灭菌智能开关", ServiceNameConst.SERVICE_HPF_WSMJ_ZNKG, IotDeviceTypeLv1Enum.HPF_WSMJ_ZNKG),
     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_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);
 
     private String code;
     private String name;

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

@@ -90,9 +90,14 @@ public class ServiceNameConst {
 
 
     /**
-     * 新浦会mqtt通用设备标识，仅作标记service使用
+     * 新浦会气象墒情mqtt通用设备
      */
-    public static final String SERVICE_XPH = "XPH_SERVICE";
+    public static final String SERVICE_XPH_YF_QXZ = "XPH-YF-QXZ-SERVICE";
+
+    /**
+     * 新浦会气象墒情mqtt通用设备
+     */
+    public static final String SERVICE_XPH_YF_SQZ = SERVICE_XPH_YF_QXZ;
 
 
     /**

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

@@ -0,0 +1,50 @@
+package com.yunfeiyun.agmp.iot.common.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * mongo
+ * 新普惠云飞气象站-采集数据
+ *
+ *
+ *                 "eValue": "123",
+ *                 "eKey": "e1",
+ *                 "eName": "Temperature",
+ *                 "eNum": "101"
+ *
+ */
+
+@Data
+@TableName("IotXphYfqxzdata")
+public class IotXphYfqxzdata extends IotBaseEntity {
+
+    public String id;
+
+    public String cId;
+
+    /**
+     * 设备标识
+     */
+    public String devBid;
+
+    /**
+     * 采集时间
+     */
+    public Date time;
+
+
+    //依照通讯协议定义以下字段
+
+    public String eNum;
+
+    public String eName;
+
+    public String eKey;
+
+    public String eValue;
+
+}