阶段提交xx病

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

@@ -110,29 +110,29 @@ public class IotDeviceDictConst {
     /**
      * 黄氏生物水稻稻瘟病预警监测
      */
-    public static final String TYPE_HS_YBQ_DWB = "2000";
+    public static final String TYPE_HS_YBQ_DWB = "HS_YBQ_DWB00001";
 
     /**
      * 黄氏生物小麦赤霉病预警监测
      */
-    public static final String TYPE_HS_YBQ_CMB = "2100";
+    public static final String TYPE_HS_YBQ_CMB = "HS_YBQ_CMB00001";
 
 
     /**
      * 黄氏生物玉米大斑病预警监测
      */
-    public static final String TYPE_HS_YBQ_DBB = "2200";
+    public static final String TYPE_HS_YBQ_DBB = "HS_YBQ_DBB00001";
 
 
     /**
      * 黄氏生物小小麦白粉病预警监测
      */
-    public static final String TYPE_HS_YBQ_BFB = "2300";
+    public static final String TYPE_HS_YBQ_BFB = "HS_YBQ_BFB00001";
 
     /**
      * 黄氏生物小麦条锈病预警监测
      */
-    public static final String TYPE_HS_YBQ_TXB = "2400";
+    public static final String TYPE_HS_YBQ_TXB = "HS_YBQ_TXB00001";
 
 
     /**

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

@@ -38,13 +38,6 @@ public enum IotDeviceDictEnum {
     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),
-
-    TYPE_HS_YBQ_DWB(IotDeviceDictConst.TYPE_HS_YBQ_DWB, "黄氏生物水稻稻瘟病预警监测", ServiceNameConst.SERVICE_HS_YBQ_DWB, IotDeviceTypeLv1Enum.YBQ_DWB),
-    TYPE_HS_YBQ_CMB(IotDeviceDictConst.TYPE_HS_YBQ_CMB, "黄氏生物小麦赤霉病预警监测", ServiceNameConst.SERVICE_HS_YBQ_CMB, IotDeviceTypeLv1Enum.YBQ_CMB),
-    TYPE_HS_YBQ_DBB(IotDeviceDictConst.TYPE_HS_YBQ_DBB, "黄氏生物玉米大斑病预警监测", ServiceNameConst.SERVICE_HS_YBQ_DBB, IotDeviceTypeLv1Enum.YBQ_DBB),
-    TYPE_HS_YBQ_BFB(IotDeviceDictConst.TYPE_HS_YBQ_BFB, "黄氏生物小麦白粉病预警监测", ServiceNameConst.SERVICE_HS_YBQ_BFB, IotDeviceTypeLv1Enum.YBQ_BFB),
-    TYPE_HS_YBQ_TXB(IotDeviceDictConst.TYPE_HS_YBQ_TXB, "黄氏生物小麦条锈病预警监测", ServiceNameConst.SERVICE_HS_YBQ_TXB, IotDeviceTypeLv1Enum.YBQ_TXB),
-
     TYPE_XPH_GSSQ(IotDeviceDictConst.TYPE_XPH_GSSQ, "新浦会管式墒情", ServiceNameConst.SERVICE_XPH_GSSQ, IotDeviceTypeLv1Enum.GSSQ),
     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),

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

@@ -67,30 +67,9 @@ public class ServiceNameConst {
 
 
     /**
-     * 黄氏生物水稻稻瘟病预警监测
+     * 黄氏生物XXX病预警监测
      */
-    public static final String SERVICE_HS_YBQ_DWB = "HS-YBQ-DWB-SERVICE";
-    /**
-     * 黄氏生物小麦赤霉病预警监测
-     */
-    public static final String SERVICE_HS_YBQ_CMB = "HS-YBQ-CMB-SERVICE";
-
-    /**
-     * 黄氏生物玉米大斑病预警监测
-     */
-    public static final String SERVICE_HS_YBQ_DBB = "HS-YBQ-DBB-SERVICE";
-
-    /**
-     * 黄氏生物小麦白粉病预警监测
-     */
-    public static final String SERVICE_HS_YBQ_BFB = "HS-YBQ-BFB-SERVICE";
-
-    /**
-     * 黄氏生物小麦条锈病预警监测
-     */
-    public static final String SERVICE_HS_YBQ_TXB = "HS-YBQ-TXB-SERVICE";
-
-
+    public static final String SERVICE_HS_YBQ = "HS-YBQ-SERVICE";
 
     /**
      * 新浦会气象墒情mqtt通用设备

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

@@ -21,7 +21,7 @@ public class IotYbqEnvData {
     /**
      * 客户id ，saas 预留
      */
-    private String cId;
+    private String tid;
 
     /**
      * 数据业务id

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

@@ -18,7 +18,7 @@ public class IotYbqPredictData {
     /**
      * 客户id ，saas 预留
      */
-    private String cId;
+    private String tid;
 
     /**
      * 数据业务id

src/main/java/com/yunfeiyun/agmp/iot/common/enums/ybq/YbqTypeConst.java

@@ -10,11 +10,11 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
  * @author zhangn
  */
 public enum YbqTypeConst {
-    YBQ_XM_CMB("1", "小麦赤霉病", ServiceNameConst.SERVICE_HS_YBQ_CMB),
-    YBQ_XM_BFB("2", "小麦白粉病", ServiceNameConst.SERVICE_HS_YBQ_BFB),
-    YBQ_YM_DBB("3", "玉米大斑病", ServiceNameConst.SERVICE_HS_YBQ_DBB),
-    YBQ_XM_TXB("4", "小麦条锈病", ServiceNameConst.SERVICE_HS_YBQ_TXB),
-    YBQ_SD_DWB("6", "水稻稻瘟病", ServiceNameConst.SERVICE_HS_YBQ_DWB);;
+    YBQ_XM_CMB("1", "小麦赤霉病预警监测", ServiceNameConst.SERVICE_HS_YBQ),
+    YBQ_XM_BFB("2", "小麦白粉病预警监测", ServiceNameConst.SERVICE_HS_YBQ),
+    YBQ_YM_DBB("3", "玉米大斑病预警监测", ServiceNameConst.SERVICE_HS_YBQ),
+    YBQ_XM_TXB("4", "小麦条锈病预警监测", ServiceNameConst.SERVICE_HS_YBQ),
+    YBQ_SD_DWB("6", "水稻稻瘟病预警监测", ServiceNameConst.SERVICE_HS_YBQ);;
     private final String code;
     private final String message;
     private String serviceName;