调整包名，增加设备在线功能

src/main/java/com/lanhai/LanHaiApplication.java

@@ -1,4 +1,4 @@
-package com.wangbin;
+package com.lanhai;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -17,12 +17,12 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  */
 @SpringBootApplication
 //@MapperScan会扫描Mapper接口类，并生成对应的实现类。
-@MapperScan({"com.wangbin.mapper","com.wangbin.module.*.mapper"})
-//@MapperScan({"com.wangbin.**.mapper"})
-public class WangbinApplication extends SpringBootServletInitializer {
+@MapperScan({"com.lanhai.mapper","com.lanhai.module.*.mapper"})
+//@MapperScan({"com.lanhai.**.mapper"})
+public class LanHaiApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
-        SpringApplication.run(WangbinApplication.class, args);
+        SpringApplication.run(LanHaiApplication.class, args);
     }
 
 
@@ -32,7 +32,7 @@ public class WangbinApplication extends SpringBootServletInitializer {
      */
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return builder.sources(WangbinApplication.class);
+        return builder.sources(LanHaiApplication.class);
     }
 
 }

src/main/java/com/lanhai/MybatisPlusGenerator.java

@@ -1,4 +1,4 @@
-package com.wangbin;
+package com.lanhai;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
@@ -21,7 +21,7 @@ public class MybatisPlusGenerator {
     //生成代码地址
     public static final String outputdir = "D:/a5";
     //包名
-    public static final String packageName = "com.wangbin";
+    public static final String packageName = "com.lanhai";
 
 
     public void generator(String... include) {

src/main/java/com/lanhai/common/Result.java

@@ -1,4 +1,4 @@
-package com.wangbin.common;
+package com.lanhai.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/lanhai/config/DruidConfig.java

@@ -1,4 +1,4 @@
-package com.wangbin.config;
+package com.lanhai.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.support.http.StatViewServlet;

src/main/java/com/lanhai/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.wangbin.config;
+package com.lanhai.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;

src/main/java/com/lanhai/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.wangbin.config;
+package com.lanhai.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

src/main/java/com/lanhai/config/ServerConfig.java

@@ -1,4 +1,4 @@
-package com.wangbin.config;
+package com.lanhai.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.context.WebServerInitializedEvent;

src/main/java/com/lanhai/config/Swagger2Config.java

@@ -1,4 +1,4 @@
-package com.wangbin.config;
+package com.lanhai.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -24,7 +24,7 @@ public class Swagger2Config {
                 .groupName("1.0版本")
                 .select()
                 //这里指定Controller扫描包路径
-                .apis(RequestHandlerSelectors.basePackage("com.wangbin.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.lanhai.controller"))
                 .paths(PathSelectors.any())
                 .build();
         return docket;

src/main/java/com/lanhai/config/XxlJobConfig.java

@@ -1,4 +1,4 @@
-package com.wangbin.config;
+package com.lanhai.config;
 
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import org.slf4j.Logger;

src/main/java/com/lanhai/constant/CommonConstant.java

@@ -1,4 +1,4 @@
-package com.wangbin.constant;
+package com.lanhai.constant;
 
 public interface CommonConstant {
 

src/main/java/com/lanhai/constant/DeviceReadConstants.java

@@ -0,0 +1,10 @@
+package com.lanhai.constant;
+
+
+public interface DeviceReadConstants {
+     String READ_NORMAL = "normal";
+
+    String READ_TOO_HIGH = "high";
+
+    String READ_TOO_LOW = "low";
+}

src/main/java/com/lanhai/constant/IotConstants.java

@@ -0,0 +1,196 @@
+package com.lanhai.constant;
+
+public interface IotConstants {
+    /**
+     * 萤石云访问
+     */
+    String ysyAcess = "ysy_access";
+
+    /**
+     * 涂鸦访问
+     */
+    String tuya_access = "tuya_access";
+
+    /**
+     * 新普惠访问
+     */
+    String xph_access = "xph_access";
+
+    /**
+     * 云飞访问
+     */
+    String yf_access = "yf_access";
+
+    /**
+     * 欧柯奇密钥
+     */
+    String okq_access = "okq_access";
+
+
+    /**
+     * 关村数字乡村
+     */
+    String gcszxc_access = "gcszxc_access";
+
+    /**
+     * 新普惠应用
+     */
+    String APPLICATION_XinPH = "XinPuHui";
+
+
+    /**
+     * 涂鸦应用
+     */
+    String APPLICATION_TuYa = "TuYa";
+
+    /**
+     * 仁科应用
+     */
+    String APPLICATION_RenKe = "RenKe";
+
+    /**
+     * 仁科应用
+     */
+    String renke_access = "RenKe_access";
+
+    /**
+     *   萤石云标准
+     */
+    String ysy_standard = "ysy_standard";
+
+    /**
+     *   新普惠v1
+     */
+    String xph_v1 = "xph_v1";
+
+    /**
+     *   新普惠v2
+     */
+    String xph_v2 = "xph_v2";
+
+    /**
+     *   欧柯奇v1
+     */
+    String okq_v1 = "okq_v1";
+
+    /**
+     *   欧柯奇v2
+     */
+    String okq_v2 = "okq_v2";
+
+    /**
+     *   博云标准
+     */
+    String by_standard = "by_standard";
+
+    /**
+     *   云飞标准
+     */
+    String yf_standard = "yf_standard";
+
+
+    /**
+     *   关村数字乡村协议
+     */
+    String gcszxc_standard = "gcszxc_standard";
+
+    /**
+     *   曲沃山东芯谷网络协议
+     */
+    String qwxgwl_standard = "qwxgwl_standard";
+
+
+    /**
+     *   曲沃山东芯谷网络密钥
+     */
+    String qwxgwl_access = "qwxgwl_access";
+
+
+    /**
+     *   曲沃山东优晟
+     */
+    String qwmeter_standard = "qwmeter_standard";
+
+    /**
+     *   曲沃山东优晟系统密钥
+     */
+    String qwmeter_access = "qwmeter_access";
+
+
+    /**
+     *   涂鸦iot协议
+     */
+    String tuya_standard = "tuya_standard";
+
+    /**
+     *   仁科协议
+     */
+    String renke_standard = "RenKe_standard";
+
+    /**
+     * 害虫目录
+     */
+    String contents_pest = "1";
+
+    /**
+     * 物联网字典缓存头
+     */
+    String iot_ele_cache = "iot_ele_cache";
+
+    /**
+     * 物联网厂家配置缓存
+     */
+    String iot_protocol_cache = "iot_protocol_cache";
+
+
+    /**
+     * 操作标记，启动
+     */
+    String operation_launch = "launch";
+
+    /**
+     * 操作标记，功能
+     */
+    String operation_function = "function";
+
+    /**
+     * 操作标记，参数设置
+     */
+    String operation_params = "params";
+
+    /**
+     * 设备启动
+     */
+    String device_on = "1";
+
+    /**
+     * 设备停止
+     */
+    String device_off = "0";
+
+
+    /**
+     * 控制类设备
+     */
+    String iot_device_control = "control";
+
+    /**
+     * 监控类设备
+     */
+    String iot_device_monitor = "monitor";
+
+    /**
+     * 监测类设备
+     */
+    String iot_device_surv = "surv";
+
+    /**
+     * 防治设备
+     */
+    String iot_device_guard = "guard";
+
+    /**
+     * 物联网配置缓存头
+     */
+    String IOT_SURVCONFIG_CACHE  = "surv:config:params";
+}

src/main/java/com/lanhai/constant/PollutionConstants.java

@@ -0,0 +1,71 @@
+package com.lanhai.constant;
+
+public interface PollutionConstants {
+    /**
+     * 水污染物
+     */
+    String WATER_ORIENT = "water_orient";
+
+    /**
+     * 水污染物
+     */
+    String WATER_LIVE = "water_live";
+    /**
+     * 水质监测
+     */
+    String WATER_QULITY="6_water";
+
+    /**
+     * 气项监测
+     */
+    String AIR_SURV = "air";
+
+
+    /**
+     * 土壤监测
+     */
+    String SOIL_SURV = "soil";
+
+
+   String STINK  = "stink";
+
+    String CAMERA  = "camera";
+
+    String SURV  = "surv";
+
+    /**
+     * 水肥机
+     */
+    String INTEGRATED_MACHINE  = "integrated_machine";
+
+    /**
+     * 水肥机
+     */
+    String INTEGRATED_CONTROL  = "integrated_control";
+    /**
+     * 控制柜
+     */
+    String CONTROL_CAB  = "control_cab";
+
+
+    /**
+     * 虫情监测
+     */
+    String BUG_SURV="7_bugsurv";
+
+
+    /**
+     * 孢子监测
+     */
+    String SPORE_SURV="8_sporesurv";
+
+    /**
+     * 孢子监测
+     */
+    String PEST_LIGHT="9_pestlight";
+
+    /**
+     * 数据生成间隔 单位秒
+     */
+    Integer dataGenGap = 3600;
+}

src/main/java/com/lanhai/constant/ToolConstant.java

@@ -0,0 +1,62 @@
+package com.lanhai.constant;
+
+public interface ToolConstant {
+
+    /**POST请求*/
+    String HTTP_POST = "POST";
+
+    /**PUT请求*/
+    String HTTP_PUT = "PUT";
+
+    /**PATCH请求*/
+    String HTTP_PATCH = "PATCH";
+
+    /**未知的*/
+    String UNKNOWN = "unknown";
+
+    /**字符串http*/
+    String STR_HTTP = "http";
+
+    /**String 类型的空值*/
+    String STRING_NULL = "null";
+
+    /**前端vue3版本Header参数名*/
+    String VERSION="X-Version";
+
+    /**存储在线程变量里的动态表名*/
+    String DYNAMIC_TABLE_NAME="DYNAMIC_TABLE_NAME";
+    /**
+     * http:// http协议
+     */
+    String HTTP_PROTOCOL = "http://";
+
+    /**
+     * https:// https协议
+     */
+    String HTTPS_PROTOCOL = "https://";
+
+    /**
+     * 萤石云应用
+     */
+    String APPLICATION_YsYun = "YingShiYun";
+
+    /**
+     * 新普惠应用
+     */
+    String APPLICATION_XinPH = "XinPuHui";
+
+    /**
+     * 云飞应用
+     */
+    String APPLICATION_YunF = "YunFei";
+
+    /**
+     * 欧克奇应用
+     */
+    String APPLICATION_Okq = "OuKeqi";
+
+    /**
+     * 涂鸦应用
+     */
+    String APPLICATION_TuYa = "TuYa";
+}

src/main/java/com/lanhai/controller/ScEquZhibiaoController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvAlertRecordController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvDeviceDeployController.java

@@ -1,12 +1,12 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
-import com.wangbin.common.Result;
-import com.wangbin.constant.CommonConstant;
-import com.wangbin.entity.SurvDeviceDeploy;
-import com.wangbin.entity.SurvTransdataOrientwater;
-import com.wangbin.service.ISurvDeviceDeployService;
-import com.wangbin.service.ISurvTransdataOrientwaterService;
+import com.lanhai.common.Result;
+import com.lanhai.constant.CommonConstant;
+import com.lanhai.entity.SurvDeviceDeploy;
+import com.lanhai.entity.SurvTransdataOrientwater;
+import com.lanhai.service.ISurvDeviceDeployService;
+import com.lanhai.service.ISurvTransdataOrientwaterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/lanhai/controller/SurvHisdataAirController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvHisdataLivestockwaterController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvHisdataLivestockwaterErrorController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvHisdataOrientwaterController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvHisdataOrientwaterErrorController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvHisdataPestlightController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvHisdataSoilController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvTransdataAirController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvTransdataLivestockwaterController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvTransdataOrientwaterController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvTransdataPestlightController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/controller/SurvTransdataSoilController.java

@@ -1,4 +1,4 @@
-package com.wangbin.controller;
+package com.lanhai.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/lanhai/entity/FSurvConfig.java

@@ -0,0 +1,119 @@
+package com.lanhai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统配置表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2024-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FSurvConfig extends Model<FSurvConfig> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    /**
+     * 参数名称
+     */
+    @TableField("CONFIG_NAME")
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    @TableField("CONFIG_KEY")
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    @TableField("CONFIG_VALUE")
+    private String configValue;
+
+    /**
+     * 参数次级键值
+     */
+    @TableField("CONFIG_VALUE_SE")
+    private String configValueSe;
+
+    /**
+     * 系统内置
+     */
+    @TableField("CONFIG_TYPE")
+    private String configType;
+
+    /**
+     * 备注
+     */
+    @TableField("CONFIG_REMARK")
+    private String configRemark;
+
+    /**
+     * 租户号
+     */
+    @TableField("TENANT_ID")
+    private String tenantId;
+
+    /**
+     * 乐观锁
+     */
+    @TableField("RE_VISION")
+    private Integer reVision;
+
+    /**
+     * 创建人
+     */
+    @TableField("CREATE_BY")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+    /**
+     * 逻辑删除
+     */
+    @TableField("IS_DEL")
+    private Integer isDel;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/lanhai/entity/ScEquZhibiao.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -73,6 +73,12 @@ public class ScEquZhibiao extends Model<ScEquZhibiao> {
     @TableField("name")
     private String name;
 
+    /**
+     * 字段名
+     */
+    @TableField("entity_field")
+    private String entityField;
+
     /**
      * 低阈值
      */
@@ -92,6 +98,19 @@ public class ScEquZhibiao extends Model<ScEquZhibiao> {
     private String nuit;
 
 
+    @TableField("chemical_name")
+    private String chemicalName;
+
+    @TableField("zhibiao_type")
+    private String zhibiaoType;
+
+    @TableField("sort_no")
+    private Integer sortNo;
+
+    @TableField("ele_key")
+    private String eleKey;
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;

src/main/java/com/lanhai/entity/SurvAlertRecord.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/lanhai/entity/SurvDeviceDeploy.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -80,6 +81,9 @@ public class SurvDeviceDeploy extends Model<SurvDeviceDeploy> {
     @TableField("DEVICE_URL")
     private String deviceUrl;
 
+    @TableField("DEVICE_IOT_URL")
+    private String deviceIotUrl;
+
     /**
      * 设备排序
      */
@@ -134,6 +138,12 @@ public class SurvDeviceDeploy extends Model<SurvDeviceDeploy> {
     @TableField("DEPLOY_TYPE")
     private String deployType;
 
+    /**
+     * 次级部署类型
+     */
+    @TableField("DEPLOY_SECONDARY_TYPE")
+    private String deploySecondaryType;
+
     /**
      * 纬度
      */
@@ -168,10 +178,37 @@ public class SurvDeviceDeploy extends Model<SurvDeviceDeploy> {
 
 
 
+    @TableField("PROTOCOL_CODE")
+    private String protocolCode;
+
+
+    @TableField("PROTOCOL_TYPE")
+    private String protocolType;
+
+    /**
+     * 部署类型大类，如monitor=监控设备，surv=监测设备，control=控制设备
+     */
+    @TableField("DEPLOY_CATE")
+    private String deployCate;
+
+    /**
+     * 设备配置id
+     */
+    @TableField("SURV_CONFIG_ID")
+    private String survConfigId;
 
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
 
+    @TableField(exist = false)
+    private List<ScEquZhibiao> scEquZhibiaoList;
+
+    /**
+     * 同设备编号的有多少id
+     */
+    @TableField(exist = false)
+    private List<String> deviceList;
+
 }

src/main/java/com/lanhai/entity/SurvHisdataAir.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -182,6 +182,12 @@ public class SurvHisdataAir extends Model<SurvHisdataAir> {
     @TableField("UPDATED_TIME")
     private Date updatedTime;
 
+    /**
+     * 更新时间
+     */
+    @TableField("DEPLOY_ID")
+    private String deployId;
+
 
     @Override
     protected Serializable pkVal() {

src/main/java/com/lanhai/entity/SurvHisdataLivestockwater.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/lanhai/entity/SurvHisdataLivestockwaterError.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/lanhai/entity/SurvHisdataOrientwater.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/lanhai/entity/SurvHisdataOrientwaterError.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/lanhai/entity/SurvHisdataPestlight.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/lanhai/entity/SurvHisdataSoil.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -170,6 +170,12 @@ public class SurvHisdataSoil extends Model<SurvHisdataSoil> {
     @TableField("UPDATED_TIME")
     private Date updatedTime;
 
+    /**
+     * 更新时间
+     */
+    @TableField("DEPLOY_ID")
+    private String deployId;
+
 
     @Override
     protected Serializable pkVal() {

src/main/java/com/lanhai/entity/SurvTransdataAir.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -175,6 +175,12 @@ public class SurvTransdataAir extends Model<SurvTransdataAir> {
     @TableField("UPDATED_TIME")
     private Date updatedTime;
 
+    /**
+     * 更新时间
+     */
+    @TableField("DEPLOY_ID")
+    private String deployId;
+
 
     @Override
     protected Serializable pkVal() {

src/main/java/com/lanhai/entity/SurvTransdataLivestockwater.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/lanhai/entity/SurvTransdataOrientwater.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/lanhai/entity/SurvTransdataPestlight.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/lanhai/entity/SurvTransdataSoil.java

@@ -1,4 +1,4 @@
-package com.wangbin.entity;
+package com.lanhai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -163,6 +163,12 @@ public class SurvTransdataSoil extends Model<SurvTransdataSoil> {
     @TableField("UPDATED_TIME")
     private Date updatedTime;
 
+    /**
+     * 更新时间
+     */
+    @TableField("DEPLOY_ID")
+    private String deployId;
+
 
     @Override
     protected Serializable pkVal() {

src/main/java/com/lanhai/enums/DeviceDeployEnum.java

@@ -0,0 +1,93 @@
+package com.lanhai.enums;
+
+public enum DeviceDeployEnum {
+
+    /** 气象监测设备 */
+    SURV_AIR("air",  "空气监测设备","surv"),
+    /** 土壤监测设备 */
+    SURV_SOIL("soil",  "土壤监测设备","surv"),
+    /** 面源水污染监测 */
+    WATER_ORIENT("water_orient", "面源水污染监测","surv"),
+    /** 畜禽水污染监测 */
+    WATER_LIVE("water_live", "畜禽水污染监测","surv"),
+    /** 水质监测 */
+    WATER_QULITY("6_water", "水质监测","surv"),
+    /**损耗出库*/
+    STINK("stink", "恶臭设备","surv"),
+
+    CAMERA("camera", "摄像头","surv"),
+
+    PEST_LIGHT("pestlight", "杀虫灯","guard"),
+
+    CONTROL_CAB("control_cab", "温室控制柜","control"),
+
+    INTEGRATED_MACHINE("integrated_machine", "水肥一体机","control"),
+
+    INTEGRATED_CONTROL("integrated_control","灌溉控制器","control"),
+
+    SURV("surv", "物联网设备","out"),
+
+    OTHER("other", "其他","other");
+
+    DeviceDeployEnum(String type, String note, String cate){
+        this.type = type;
+        this.note = note;
+        this.cate = cate;
+    }
+
+    /**
+     * 类型代号
+     */
+    String type;
+
+    /**
+     * 类型说明
+     */
+    String note;
+    /**
+     * 类型
+     */
+    String cate;
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+    public String getCate() {
+        return cate;
+    }
+
+    public void setCate(String cate) {
+        this.cate = cate;
+    }
+
+
+    /**
+     * 根据type获取枚举
+     *
+     * @param type
+     * @return
+     */
+    public static DeviceDeployEnum valueOfType(String type) {
+        for (DeviceDeployEnum e : DeviceDeployEnum.values()) {
+            if (e.getType().equals(type)) {
+                return e;
+            }
+        }
+        return OTHER;
+    }
+
+}

src/main/java/com/lanhai/enums/GcDeviceEnum.java

@@ -0,0 +1,87 @@
+package com.lanhai.enums;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum GcDeviceEnum {
+
+    /** 一体式气象站 */
+    SURV_AIR("air",  "一体式气象站","surv"),
+    /** 土壤温湿度传感器 */
+    SURV_SOIL("soil",  "土壤温湿度传感器","surv"),
+    /**自动虫情测报灯*/
+    BUG_SURV("7_bugsurv", "自动虫情测报灯","surv"),
+    /**摄像头*/
+    CAMERA("camera", "摄像头","surv"),
+    /**杀虫灯*/
+    PEST_LIGHT("9_pestlight", "杀虫灯","guard"),
+    /**虫情监测*/
+    OTHER("other", "其他","other");
+
+    GcDeviceEnum(String type, String note, String cate){
+        this.type = type;
+        this.note = note;
+        this.cate = cate;
+    }
+
+    /**
+     * 类型代号
+     */
+    String type;
+
+    /**
+     * 类型说明
+     */
+    String note;
+    /**
+     * 类型
+     */
+    String cate;
+
+
+
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+    public String getCate() {
+        return cate;
+    }
+
+    public void setCate(String cate) {
+        this.cate = cate;
+    }
+
+
+    /**
+     * 根据note获取枚举
+     *
+     * @param note
+     * @return
+     */
+    public static GcDeviceEnum valueOfNote(String note) {
+        for (GcDeviceEnum e : GcDeviceEnum.values()) {
+            if(StringUtils.isNotBlank(note)){
+                note = note.trim();
+            }
+            if (e.getNote().equals(note)) {
+                return e;
+            }
+        }
+        return OTHER;
+    }
+
+}

src/main/java/com/lanhai/enums/hr/HaiRuiCmdEnum.java

@@ -0,0 +1,86 @@
+package com.lanhai.enums.hr;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum HaiRuiCmdEnum {
+
+    /** 测试校验数据 */
+    HR_DEBUG("debug",  "测试校验数据","Insect"),
+    /** 设备上线 */
+    HR_ONLINE("online",  "设备上线","Insect"),
+    /**设备离线*/
+    HR_OFFLINE("offline", "设备离线","Insect"),
+    /**状态数据*/
+    HR_DATA("data", "状态数据","Insect"),
+    /**虫情图片*/
+    HR_IMAGE("image", "虫情图片","Insect"),
+    /**虫情监测*/
+    OTHER("other", "其他","other");
+
+    HaiRuiCmdEnum(String type, String note, String cate){
+        this.type = type;
+        this.note = note;
+        this.cate = cate;
+    }
+
+    /**
+     * 类型代号
+     */
+    String type;
+
+    /**
+     * 类型说明
+     */
+    String note;
+    /**
+     * 类型
+     */
+    String cate;
+
+
+
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+    public String getCate() {
+        return cate;
+    }
+
+    public void setCate(String cate) {
+        this.cate = cate;
+    }
+
+
+    /**
+     * 根据note获取枚举
+     *
+     * @param note
+     * @return
+     */
+    public static HaiRuiCmdEnum valueOfType(String type) {
+        for (HaiRuiCmdEnum e : HaiRuiCmdEnum.values()) {
+            if(StringUtils.isNotBlank(type)){
+                type = type.trim();
+            }
+            if (e.getType().equals(type)) {
+                return e;
+            }
+        }
+        return OTHER;
+    }
+}

src/main/java/com/lanhai/enums/hr/HaiRuiInsectStatusEnum.java

@@ -0,0 +1,90 @@
+package com.lanhai.enums.hr;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum HaiRuiInsectStatusEnum {
+
+    /** 雨控状态 */
+    HR_DEBUG("Rain_Status",  "雨控状态","rainStatus"),
+    /** 倾斜状态 */
+    HR_ONLINE("Tilt_Status",  "倾斜状态","tiltStatus"),
+    /**电击次数*/
+    HR_ELE_SHOCK("Electric_Shock", "电击次数","eleShock"),
+    /**充电电压*/
+    HR_CHARGE("Charging_Voltage", "充电电压","chargingVoltage"),
+    /**电池电量*/
+    HR_BATTERY("Battery_Voltage", "电池电量","batteryVoltage"),
+    /**设备状态*/
+    HR_LAMP_STATUS("Lamp_Status", "设备状态","lampStatus"),
+    /**工作状态*/
+    HR_DATA("Slave_Status", "工作状态","slaveStatus"),
+    /**虫情监测*/
+    OTHER("other", "其他","other");
+
+    HaiRuiInsectStatusEnum(String type, String note, String cate){
+        this.type = type;
+        this.note = note;
+        this.cate = cate;
+    }
+
+    /**
+     * 类型代号
+     */
+    String type;
+
+    /**
+     * 类型说明
+     */
+    String note;
+    /**
+     * 类型
+     */
+    String cate;
+
+
+
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+    public String getCate() {
+        return cate;
+    }
+
+    public void setCate(String cate) {
+        this.cate = cate;
+    }
+
+
+    /**
+     * 根据note获取枚举
+     *
+     * @param note
+     * @return
+     */
+    public static HaiRuiInsectStatusEnum valueOfType(String type) {
+        for (HaiRuiInsectStatusEnum e : HaiRuiInsectStatusEnum.values()) {
+            if(StringUtils.isNotBlank(type)){
+                type = type.trim();
+            }
+            if (e.getType().equals(type)) {
+                return e;
+            }
+        }
+        return OTHER;
+    }
+}

src/main/java/com/lanhai/mapper/FSurvConfigMapper.java

@@ -0,0 +1,18 @@
+package com.lanhai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lanhai.entity.FSurvConfig;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 系统配置表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2024-12-18
+ */
+public interface FSurvConfigMapper extends BaseMapper<FSurvConfig> {
+
+    FSurvConfig getOneByTypeWithTenant(@Param("tenantId") String tenantId, @Param("type")String type);
+}

src/main/java/com/lanhai/mapper/ScEquZhibiaoMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.ScEquZhibiao;
+import com.lanhai.entity.ScEquZhibiao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvAlertRecordMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvAlertRecord;
+import com.lanhai.entity.SurvAlertRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvDeviceDeployMapper.java

@@ -0,0 +1,20 @@
+package com.lanhai.mapper;
+
+import com.lanhai.entity.SurvDeviceDeploy;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备部署表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-07-13
+ */
+public interface SurvDeviceDeployMapper extends BaseMapper<SurvDeviceDeploy> {
+
+    List<SurvDeviceDeploy> getProtocolDeviceType(@Param("protocolCode")List<String> protocolCode, @Param("deployTypeList") List<String> deviceType);
+}

src/main/java/com/lanhai/mapper/SurvHisdataAirMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataAir;
+import com.lanhai.entity.SurvHisdataAir;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvHisdataLivestockwaterErrorMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataLivestockwaterError;
+import com.lanhai.entity.SurvHisdataLivestockwaterError;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvHisdataLivestockwaterMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataLivestockwater;
+import com.lanhai.entity.SurvHisdataLivestockwater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvHisdataOrientwaterErrorMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataOrientwaterError;
+import com.lanhai.entity.SurvHisdataOrientwaterError;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvHisdataOrientwaterMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataOrientwater;
+import com.lanhai.entity.SurvHisdataOrientwater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvHisdataPestlightMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataPestlight;
+import com.lanhai.entity.SurvHisdataPestlight;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvHisdataSoilMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvHisdataSoil;
+import com.lanhai.entity.SurvHisdataSoil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvTransdataAirMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvTransdataAir;
+import com.lanhai.entity.SurvTransdataAir;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvTransdataLivestockwaterMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvTransdataLivestockwater;
+import com.lanhai.entity.SurvTransdataLivestockwater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvTransdataOrientwaterMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvTransdataOrientwater;
+import com.lanhai.entity.SurvTransdataOrientwater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvTransdataPestlightMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvTransdataPestlight;
+import com.lanhai.entity.SurvTransdataPestlight;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/SurvTransdataSoilMapper.java

@@ -1,6 +1,6 @@
-package com.wangbin.mapper;
+package com.lanhai.mapper;
 
-import com.wangbin.entity.SurvTransdataSoil;
+import com.lanhai.entity.SurvTransdataSoil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/lanhai/mapper/xml/FSurvConfigMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.FSurvConfigMapper">
+
+    <select id="getOneByTypeWithTenant" resultType="com.lanhai.entity.FSurvConfig">
+        select * from surv_config where CONFIG_TYPE = #{type} AND TENANT_ID = #{tenantId} limit 1
+    </select>
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/ScEquZhibiaoMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangbin.mapper.ScEquZhibiaoMapper">
+<mapper namespace="com.lanhai.mapper.ScEquZhibiaoMapper">
 
 </mapper>

src/main/java/com/lanhai/mapper/xml/SurvAlertRecordMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangbin.mapper.SurvAlertRecordMapper">
+<mapper namespace="com.lanhai.mapper.SurvAlertRecordMapper">
 
 </mapper>

src/main/java/com/lanhai/mapper/xml/SurvDeviceDeployMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvDeviceDeployMapper">
+
+    <select id="getProtocolDeviceType" resultType="com.lanhai.entity.SurvDeviceDeploy">
+        select t.*
+        from surv_device_deploy t  where t.RUN_STATUS = '0' and t.IS_DEL = 0
+        <if test="protocolCode != null and protocolCode.size()>0">
+            and t.PROTOCOL_CODE IN
+            <foreach item="id" collection="protocolCode" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        AND t.DEPLOY_TYPE IN
+        <foreach item="id" collection="deployTypeList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataAirMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangbin.mapper.SurvHisdataAirMapper">
+<mapper namespace="com.lanhai.mapper.SurvHisdataAirMapper">
 
 </mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataLivestockwaterErrorMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvHisdataLivestockwaterErrorMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataLivestockwaterMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangbin.mapper.SurvTransdataOrientwaterMapper">
+<mapper namespace="com.lanhai.mapper.SurvHisdataLivestockwaterMapper">
 
 </mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataOrientwaterErrorMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvHisdataOrientwaterErrorMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataOrientwaterMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvHisdataOrientwaterMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataPestlightMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvHisdataPestlightMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvHisdataSoilMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangbin.mapper.SurvHisdataSoilMapper">
+<mapper namespace="com.lanhai.mapper.SurvHisdataSoilMapper">
 
 </mapper>

src/main/java/com/lanhai/mapper/xml/SurvTransdataAirMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvTransdataAirMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvTransdataLivestockwaterMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvTransdataLivestockwaterMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvTransdataOrientwaterMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvTransdataOrientwaterMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvTransdataPestlightMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanhai.mapper.SurvTransdataPestlightMapper">
+
+</mapper>

src/main/java/com/lanhai/mapper/xml/SurvTransdataSoilMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangbin.mapper.SurvDeviceDeployMapper">
+<mapper namespace="com.lanhai.mapper.SurvTransdataSoilMapper">
 
 </mapper>

src/main/java/com/lanhai/o/iot/common/DeviceStatusVo.java

@@ -0,0 +1,15 @@
+package com.lanhai.o.iot.common;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceStatusVo {
+    /*设备部署ID*/
+    private String deployId;
+    /*设备部署ID*/
+    private boolean isOnline;
+    /*上次在线时间*/
+    private Date lastOnlineTime;
+}

src/main/java/com/lanhai/o/iot/renke/DataItem.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2025 bejson.com
+ */
+package com.lanhai.o.iot.renke;
+import java.util.List;
+
+/**
+ * Auto-generated: 2025-09-11 10:47:4
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class DataItem {
+
+    private int nodeId;
+    private List<RegisterItem> registerItem;
+    public void setNodeId(int nodeId) {
+        this.nodeId = nodeId;
+    }
+    public int getNodeId() {
+        return nodeId;
+    }
+
+    public void setRegisterItem(List<RegisterItem> registerItem) {
+        this.registerItem = registerItem;
+    }
+    public List<RegisterItem> getRegisterItem() {
+        return registerItem;
+    }
+
+}

src/main/java/com/lanhai/o/iot/renke/RegisterItem.java

@@ -0,0 +1,78 @@
+/**
+ * Copyright 2025 bejson.com
+ */
+package com.lanhai.o.iot.renke;
+
+/**
+ * Auto-generated: 2025-09-11 10:47:4
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class RegisterItem {
+
+    private int registerId;
+    private String data;
+    private double value;
+    private int alarmLevel;
+    private String alarmColor;
+    private String alarmInfo;
+    private String unit;
+    private String registerName;
+    public void setRegisterId(int registerId) {
+        this.registerId = registerId;
+    }
+    public int getRegisterId() {
+        return registerId;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+    public String getData() {
+        return data;
+    }
+
+    public void setValue(double value) {
+        this.value = value;
+    }
+    public double getValue() {
+        return value;
+    }
+
+    public void setAlarmLevel(int alarmLevel) {
+        this.alarmLevel = alarmLevel;
+    }
+    public int getAlarmLevel() {
+        return alarmLevel;
+    }
+
+    public void setAlarmColor(String alarmColor) {
+        this.alarmColor = alarmColor;
+    }
+    public String getAlarmColor() {
+        return alarmColor;
+    }
+
+    public void setAlarmInfo(String alarmInfo) {
+        this.alarmInfo = alarmInfo;
+    }
+    public String getAlarmInfo() {
+        return alarmInfo;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setRegisterName(String registerName) {
+        this.registerName = registerName;
+    }
+    public String getRegisterName() {
+        return registerName;
+    }
+
+}

src/main/java/com/lanhai/o/iot/renke/RelayStatusItems.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2025 bejson.com
+ */
+package com.lanhai.o.iot.renke;
+
+/**
+ * Auto-generated: 2025-09-11 10:47:4
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class RelayStatusItems {
+
+    private int relayNo;
+    private int relayStatus;
+    public void setRelayNo(int relayNo) {
+        this.relayNo = relayNo;
+    }
+    public int getRelayNo() {
+        return relayNo;
+    }
+
+    public void setRelayStatus(int relayStatus) {
+        this.relayStatus = relayStatus;
+    }
+    public int getRelayStatus() {
+        return relayStatus;
+    }
+
+}

src/main/java/com/lanhai/o/iot/renke/RenKeResultPack.java

@@ -0,0 +1,10 @@
+package com.lanhai.o.iot.renke;
+
+import lombok.Data;
+
+@Data
+public class RenKeResultPack {
+
+    private String code;
+    private String message;
+}

src/main/java/com/lanhai/o/iot/renke/RenkeDataRealTimeDetail.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2025 bejson.com
+ */
+package com.lanhai.o.iot.renke;
+import java.util.List;
+
+/**
+ * Auto-generated: 2025-09-11 10:47:4
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class RenkeDataRealTimeDetail {
+
+    private String systemCode;
+    private long deviceAddr;
+    private String deviceName;
+    private int lat;
+    private int lng;
+    private String deviceStatus;
+    private String relayStatus;
+    private List<RelayStatusItems> relayStatusItems;
+    private List<DataItem> dataItem;
+    private long timeStamp;
+    public void setSystemCode(String systemCode) {
+        this.systemCode = systemCode;
+    }
+    public String getSystemCode() {
+        return systemCode;
+    }
+
+    public void setDeviceAddr(long deviceAddr) {
+        this.deviceAddr = deviceAddr;
+    }
+    public long getDeviceAddr() {
+        return deviceAddr;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setLat(int lat) {
+        this.lat = lat;
+    }
+    public int getLat() {
+        return lat;
+    }
+
+    public void setLng(int lng) {
+        this.lng = lng;
+    }
+    public int getLng() {
+        return lng;
+    }
+
+    public void setDeviceStatus(String deviceStatus) {
+        this.deviceStatus = deviceStatus;
+    }
+    public String getDeviceStatus() {
+        return deviceStatus;
+    }
+
+    public void setRelayStatus(String relayStatus) {
+        this.relayStatus = relayStatus;
+    }
+    public String getRelayStatus() {
+        return relayStatus;
+    }
+
+    public void setRelayStatusItems(List<RelayStatusItems> relayStatusItems) {
+        this.relayStatusItems = relayStatusItems;
+    }
+    public List<RelayStatusItems> getRelayStatusItems() {
+        return relayStatusItems;
+    }
+
+    public void setDataItem(List<DataItem> dataItem) {
+        this.dataItem = dataItem;
+    }
+    public List<DataItem> getDataItem() {
+        return dataItem;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+}

src/main/java/com/lanhai/o/iot/renke/RenkeDataRealTimePack.java

@@ -0,0 +1,10 @@
+package com.lanhai.o.iot.renke;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RenkeDataRealTimePack extends RenKeResultPack {
+   private List<RenkeDataRealTimeDetail> data;
+}

src/main/java/com/lanhai/o/iot/renke/enums/RkItemEnum.java

@@ -0,0 +1,89 @@
+package com.lanhai.o.iot.renke.enums;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum RkItemEnum {
+
+    /** 土壤温度 */
+    RK_SOIL_TEMP("土壤温度",  "土壤温度","soil"),
+    /** 土壤水分 */
+    RK_SOIL_HUM("土壤水分",  "土壤水分","soil"),
+    /**电导率*/
+    RK_SOIL_DDL("电导率", "电导率","soil"),
+    /**磷*/
+    RK_SOIL_P("磷", "磷","soil"),
+    /**氮*/
+    RK_SOIL_N("氮", "氮","soil"),
+    /**钾*/
+    RK_SOIL_K("钾", "钾","soil"),
+    /**虫情监测*/
+    OTHER("other", "其他","other");
+
+    RkItemEnum(String type, String note, String cate){
+        this.type = type;
+        this.note = note;
+        this.cate = cate;
+    }
+
+    /**
+     * 类型代号
+     */
+    String type;
+
+    /**
+     * 类型说明
+     */
+    String note;
+    /**
+     * 类型
+     */
+    String cate;
+
+
+
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+    public String getCate() {
+        return cate;
+    }
+
+    public void setCate(String cate) {
+        this.cate = cate;
+    }
+
+
+    /**
+     * 根据note获取枚举
+     *
+     * @param note
+     * @return
+     */
+    public static RkItemEnum valueOfNote(String note) {
+        for (RkItemEnum e : RkItemEnum.values()) {
+            if(StringUtils.isNotBlank(note)){
+                note = note.trim();
+            }
+            if (e.getNote().equals(note)) {
+                return e;
+            }
+        }
+        return OTHER;
+    }
+
+}

src/main/java/com/lanhai/o/iot/xph/XphControlLogDetailVo.java

@@ -0,0 +1,29 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+@Data
+public class XphControlLogDetailVo {
+    /*id*/
+    private Integer id;
+    /*时间*/
+    private String createTime;
+    /*设备编号*/
+    private Integer facId;
+    /*继电器序号*/
+    private Integer num;
+    /*继电器名称*/
+    private String name;
+    /*指令值*/
+    private Integer state;
+    /*操作结果*/
+    private boolean result;
+    /*用户名*/
+    private String username;
+    /*time*/
+    private String time;
+    /*type*/
+    private Integer type;
+    /*id*/
+    private String userId;
+}

src/main/java/com/lanhai/o/iot/xph/XphControlLogVo.java

@@ -0,0 +1,30 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class XphControlLogVo {
+    /*控制数据*/
+    private List<XphControlLogDetailVo> records;
+    /*数据总计*/
+    private Integer total;
+    /*分页值*/
+    private Integer size;
+    /*当前页数*/
+    private Integer current;
+    /*指令*/
+    private List<String> orders;
+    /*optimizeCountSql*/
+    private boolean optimizeCountSql;
+    /*searchCount*/
+    private boolean searchCount;
+    /*countId*/
+    private String countId;
+    /*maxLimit*/
+    private Integer maxLimit;
+    /*总页数*/
+    private Integer pages;
+
+}

src/main/java/com/lanhai/o/iot/xph/XphDeviceInfoVo.java

@@ -0,0 +1,75 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+@Data
+public class XphDeviceInfoVo {
+    /*设备编号*/
+    private Integer id;
+    /*设备编号*/
+    private Integer facId;
+    /*设备创建时间*/
+    private String createTime;
+    /*设备备注信息*/
+    private String remark;
+    /*设备名称*/
+    private String facName;
+    /*设备类型，0-为兼容 XPH 协议的设备，1-为虫情相关的设备*/
+    private Integer facType;
+    /*16 路要素通道的索引，以'/'分隔，需要解析为包含 16 个索引的数组，索引对应的具体要素见附录*/
+    private String eleNum;
+    /*16 路要素通道的名称，以'/'分隔，'-'则表示使用附录要素列表中的默认名称*/
+    private String eleName;
+    /*32 路继电器通道的索引，以'/'分隔，需要解析为包含 32 个索引的数组，索引对应的具体继电器见附录*/
+    private String relayNum;
+    /*32 路继电器通道的名称，以'/'分隔，'-'则表示使用附录继电器列表中的默认名称*/
+    private String relayName;
+    /*经度，具体格式为百度地图经纬度拾取中的格式*/
+    private Integer longitude;
+    /*纬度，具体格式为百度地图经纬度拾取中的格式*/
+    private Integer latitude;
+    /*平台读取实时数据的间隔，单位分钟，默认为 1*/
+    private Integer readInterval;
+    /**/
+    private Integer address;
+    /*是否有网络摄像头，目前只支持海康及萤石云的摄像头*/
+    private Boolean photo;
+    /*创建该用户的管理员 ID，可忽略*/
+    private Integer creatorId;
+    /*是否有扩展的继电器，若为 false，以下三项可忽略*/
+    private Boolean relayExtend;
+    /*扩展继电器数量*/
+    private Integer relayExtendCount;
+    /*扩展继电器通道的索引，以'/'分隔，具体个数为扩展继电器数量*/
+    private String relayExtendNum;
+    /*扩展继电器通道的名称，以'/'分隔，具体个数为扩展继电器数量*/
+    private String relayExtendName;
+    /*设备图片地址*/
+    private String coverUrl;
+    /**/
+    private Boolean elementExtend;
+    /**/
+    private String elementExtendNum;
+    /**/
+    private String elementExtendName;
+    /**/
+    private String sim;
+    /**/
+    private String weight;
+    /**/
+    private String facDescribe;
+    /**/
+    private String deviceType;
+    /**/
+    private Integer parkId;
+    /**/
+    private Boolean online;
+    /**/
+    private String relaysRelation;
+    /**/
+    private String video;
+    /**/
+    private String elementIndexList;
+    /**/
+    private String elementNameList;
+}

src/main/java/com/lanhai/o/iot/xph/XphDeviceNewestDataCurrentVo.java

@@ -0,0 +1,144 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class XphDeviceNewestDataCurrentVo {
+    private String facId;
+
+    private String dataTime;
+
+    private String e1;
+
+    private String e2;
+
+    private String e3;
+
+    private String e4;
+
+    private String e5;
+
+    private String e6;
+
+    private String e7;
+
+    private String e8;
+
+    private String e9;
+
+    private String e10;
+
+    private String e11;
+
+    private String e12;
+
+    private String e13;
+
+    private String e14;
+
+    private String e15;
+
+    private String e16;
+
+    private String e17;
+
+    private String e18;
+
+    private String e19;
+
+    private String e20;
+
+    private String e21;
+
+    private String e22;
+
+    private String e23;
+
+    private String e24;
+
+    private String e25;
+
+    private String e26;
+
+    private String e27;
+
+    private String e28;
+
+    private String e29;
+
+    private String e30;
+
+    private String e31;
+
+    private String e32;
+
+    private String j1;
+
+    private String j2;
+
+    private String j3;
+
+    private String j4;
+
+    private String j5;
+
+    private String j6;
+
+    private String j7;
+
+    private String j8;
+
+    private String j9;
+
+    private String j10;
+
+    private String j11;
+
+    private String j12;
+
+    private String j13;
+
+    private String j14;
+
+    private String j15;
+
+    private String j16;
+
+    private String j17;
+
+    private String j18;
+
+    private String j19;
+
+    private String j20;
+
+    private String j21;
+
+    private String j22;
+
+    private String j23;
+
+    private String j24;
+
+    private String j25;
+
+    private String j26;
+
+    private String j27;
+
+    private String j28;
+
+    private String j29;
+
+    private String j30;
+
+    private String j31;
+
+    private String j32;
+
+    private String _id;
+
+    private List<String> IMAGE_FILE;
+}

src/main/java/com/lanhai/o/iot/xph/XphDeviceNewestDataDetailVo.java

@@ -0,0 +1,13 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class XphDeviceNewestDataDetailVo {
+    private String datetime;
+    private XphDeviceNewestDataCurrentVo currentData;
+    private List<XphDeviceNewestDataEleVo> eleLists;
+    private List<XphDeviceNewestDataRelVo> relLists;
+}

src/main/java/com/lanhai/o/iot/xph/XphDeviceNewestDataEleVo.java

@@ -0,0 +1,19 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+@Data
+public class XphDeviceNewestDataEleVo {
+    /*单位*/
+    private String eUnit;
+    /*图标*/
+    private String eUrl;
+    /*传感器值*/
+    private String eValue;
+    /*序号*/
+    private String eKey;
+    /*元素名称*/
+    private String eName;
+    /*元素字典*/
+    private String eNum;
+}

src/main/java/com/lanhai/o/iot/xph/XphDeviceNewestDataRelVo.java

@@ -0,0 +1,15 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+@Data
+public class XphDeviceNewestDataRelVo {
+    /*继电器状态，中文*/
+    private String value;
+    /*继电器编号，j+序号，如j13*/
+    private String key;
+    /*继电器名称*/
+    private String name;
+    /*继电器类型*/
+    private Integer index;
+}

src/main/java/com/lanhai/o/iot/xph/XphDeviceNewestDataVo.java

@@ -0,0 +1,17 @@
+package com.lanhai.o.iot.xph;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class XphDeviceNewestDataVo {
+    /**
+     * 设备数据
+     */
+    private List<XphDeviceNewestDataDetailVo> list;
+    /**
+     * 数据量
+     */
+    private Integer total;
+}

src/main/java/com/lanhai/o/iot/ysy/VOYsyApiResult.java

@@ -0,0 +1,11 @@
+package com.lanhai.o.iot.ysy;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+@Data
+public class VOYsyApiResult {
+    private String code;
+    private String msg;
+    private JSONObject data;
+}

src/main/java/com/lanhai/o/iot/ysy/VOYsyResultPack.java

@@ -0,0 +1,9 @@
+package com.lanhai.o.iot.ysy;
+
+import lombok.Data;
+
+@Data
+public class VOYsyResultPack {
+    private VOYsyApiResult voYsyApiResult;
+    private Boolean isSuccess;
+}

src/main/java/com/lanhai/o/vo/HttpResponseVo.java

@@ -0,0 +1,12 @@
+package com.lanhai.o.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import org.springframework.http.HttpHeaders;
+
+@Data
+public class HttpResponseVo {
+    private boolean isOk;
+    private JSONObject data;
+    private HttpHeaders responseHeaders;
+}