Explorar o código

新增 孢子仪实体类

zhaiyifei hai 1 ano
pai
achega
d2e092c07b

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

@@ -116,11 +116,11 @@ public class IotMqttConstant {
         public final static String TOPIC_BZY_HISTORY_PHOTO_PREFIX = "/yfkj/history/bzy/photo/";
 
         //低端款孢子仪的主题都增加了一个L(拍照消息除外)
-        public final static String TOPIC_BZY_REPORT_PREFIX_2 = "/yfkj/bzyL/c2s/";
+        public final static String TOPIC_BZY_L_REPORT_PREFIX = "/yfkj/bzyL/c2s/";
 
-        public final static String TOPIC_BZY_CMD_PREFIX_2 = "/yfkj/bzyL/s2c/";
+        public final static String TOPIC_BZY_L_CMD_PREFIX = "/yfkj/bzyL/s2c/";
 
-        public final static String TOPIC_BZY_OFFLINE_PREFIX_2 = "/yfkj/bzyL/offline/";
+        public final static String TOPIC_BZY_L_OFFLINE_PREFIX = "/yfkj/bzyL/offline/";
 
     }
 

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotSpore.java

@@ -71,6 +71,8 @@ public class IotSpore extends IotBaseEntity
     /** 类型  1孢子 2病害 */
     private String sporeType;
 
+    private String tid;
+
 
 
 }

+ 1 - 2
src/main/java/com/yunfeiyun/agmp/iot/common/domain/reqvo/IotBzyConfigEditReqVo.java

@@ -1,12 +1,11 @@
 package com.yunfeiyun.agmp.iot.common.domain.reqvo;
 
 import com.yunfeiyun.agmp.iot.common.domain.device.config.IotBzyConfig;
-import com.yunfeiyun.agmp.iot.common.domain.device.config.IotCbdConfig;
 import lombok.Data;
 
 @Data
 public class IotBzyConfigEditReqVo {
-    private String bzydataBid;
+    private String devBid;
     private IotBzyConfig iotBzyConfig;
 
 }

+ 2 - 3
src/main/java/com/yunfeiyun/agmp/iot/common/domain/reqvo/IotBzydataReqVo.java

@@ -1,11 +1,10 @@
 package com.yunfeiyun.agmp.iot.common.domain.reqvo;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotBzydata;
-import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
 import lombok.Data;
 
 @Data
 public class IotBzydataReqVo extends IotBzydata {
-    private String startDate;
-    private String endDate;
+    private String startTime;
+    private String endTime;
 }