新增 中捷四方设备图片对接

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

@@ -352,16 +352,19 @@ public class IotDeviceDictConst {
      */
     /**
      * 云飞-性诱测报灯III
+     * 带控制 不带图片
      */
     public static final String TYPE_YF_XYCB_III = "XYCB00003";
 
     /**
      * 云飞-性诱测报灯2.0
      * 宁录-性诱测报灯
+     * 不带控制 不带图片
      */
     public static final String TYPE_YF_XYCB_2 = "XYCB00004";
     /**
      * 中捷四方性诱
+     * 带图片 不带控制
      */
     public static final String TYPE_ZJSF_XYCB = "XYCB00005";
 }

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

@@ -56,8 +56,6 @@ public enum IotDeviceDictEnum {
     TYPE_YF_GXZW(IotDeviceDictConst.TYPE_YF_GXZW, "根系作物监测", ServiceNameConst.SERVICE_YF_GXZW, IotDeviceTypeLv1Enum.SQZ),
 
     TYPE_XPH_TRSH_CL(IotDeviceDictConst.TYPE_XPH_TRSH_CL, "土壤水势测量", ServiceNameConst.SERVICE_XPH_TRSH_CL, IotDeviceTypeLv1Enum.TRSH_CL),
-
-    TYPE_ZJSF_XYCB(IotDeviceDictConst.TYPE_ZJSF_XYCB, "中捷四方性诱", ServiceNameConst.SERVICE_ZJSF_XYCB, IotDeviceTypeLv1Enum.XYCB),
     /**
      * 大数据平台监控设备，用于通过mqtt接收设备定时上报的抓拍图片
      */
@@ -108,6 +106,7 @@ public enum IotDeviceDictEnum {
 
 
     TYPE_YF_XYCB_III(IotDeviceDictConst.TYPE_YF_XYCB_III, "云飞-性诱测报灯III", ServiceNameConst.SERVICE_YF_XYCB_III, IotDeviceTypeLv1Enum.XYCB),
+    TYPE_ZJSF_XYCB(IotDeviceDictConst.TYPE_ZJSF_XYCB, "中捷四方性诱", ServiceNameConst.SERVICE_ZJSF_XYCB, IotDeviceTypeLv1Enum.XYCB),
     /**  宁录性诱测报灯 */
     TYPE_YF_XYCB_2(IotDeviceDictConst.TYPE_YF_XYCB_2, "云飞-性诱测报灯2.0", ServiceNameConst.SERVICE_YF_XYCB_2, IotDeviceTypeLv1Enum.XYCB);
 

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

@@ -35,6 +35,8 @@ public class IotXycbimg extends IotBaseEntity
     @Excel(name = "原图地址")
     private String xycbimgAddr;
 
+    private String xycbimgOssAddr;
+
     /** 修改时间 */
     @Excel(name = "修改时间")
     private String xycbimgModifieddate;

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

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -11,18 +10,6 @@ import lombok.Data;
  */
 @Data
 @TableName("IotZjsfXycbdata")
-public class IotZjsfXycbdata extends IotBaseEntity{
-
-    private String id;
-
-    private String tid;
-
-    private String xycbdataBid;
-
-    private String devBid;
-
-    private JSONObject xycbdataContent;
-
-    private String xycbdataCreatedDate;
+public class IotZjsfXycbdata extends IotYfXycbdata {
 
 }