fix: 微信小程序接口对接修改，联调测试问题修复。

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqAddLinkedCtrl.java

@@ -0,0 +1,34 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 新增联动控制请求对象
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class ReqAddLinkedCtrl implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private Long deviceId;
+
+    /**
+     * 开关ID列表
+     */
+    @NotEmpty(message = "开关ID列表不能为空")
+    private List<Long> listSwitchId;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqChangeName.java

@@ -0,0 +1,39 @@
+package com.intc.fishery.domain.bo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 修改设备名称请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+@Schema(description = "修改设备名称请求对象")
+public class ReqChangeName implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @Schema(description = "设备ID")
+    @NotNull(message = "设备ID不能为空")
+    private Long id;
+
+    /**
+     * 新名称
+     */
+    @Schema(description = "新名称")
+    @NotBlank(message = "新名称不能为空")
+    @Size(max = 10, message = "名称长度不能超过10个字符")
+    private String newName;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqChangePond.java

@@ -0,0 +1,35 @@
+package com.intc.fishery.domain.bo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 修改设备塘口请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+@Schema(description = "修改设备塘口请求对象")
+public class ReqChangePond implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @Schema(description = "设备ID")
+    @NotNull(message = "设备ID不能为空")
+    private Long id;
+
+    /**
+     * 塘口ID（为null或0表示移除塘口）
+     */
+    @Schema(description = "塘口ID（为null或0表示移除塘口）")
+    private Long pondId;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqDeviceCalibrate.java

@@ -0,0 +1,32 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设备校准请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class ReqDeviceCalibrate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private Long id;
+
+    /**
+     * 校准码
+     */
+    @NotNull(message = "校准码不能为空")
+    private String code;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqDeviceSalinityCompensation.java

@@ -0,0 +1,32 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置盐度补偿请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class ReqDeviceSalinityCompensation implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private Long id;
+
+    /**
+     * 盐度补偿值
+     */
+    @NotNull(message = "盐度补偿值不能为空")
+    private Double salinityCompensation;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqId.java

@@ -0,0 +1,26 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * ID请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class ReqId implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空")
+    private Long id;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqLinkedCtrlOpen.java

@@ -0,0 +1,38 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置联动控制开关请求对象
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class ReqLinkedCtrlOpen implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联动控制ID
+     */
+    @NotNull(message = "联动控制ID不能为空")
+    private Long id;
+
+    /**
+     * 开关类型（1-上限开关，2-下限开关）
+     */
+    @NotNull(message = "开关类型不能为空")
+    private Integer openType;
+
+    /**
+     * 是否开启（0-关闭，1-开启）
+     */
+    @NotNull(message = "开关状态不能为空")
+    private Integer isOpen;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqSetOxyTempWarnCall.java

@@ -0,0 +1,44 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置溶解氧/温度告警开关请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class ReqSetOxyTempWarnCall implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private Long deviceId;
+
+    /**
+     * 类型（1-溶解氧告警，2-温度告警）
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+    /**
+     * 是否打开告警开关
+     */
+    @NotNull(message = "告警开关不能为空")
+    private Integer isOpen;
+
+    /**
+     * 是否开启免打扰
+     */
+    @NotNull(message = "免打扰开关不能为空")
+    private Integer isNoDisturb;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqSetOxyWarnValue.java

@@ -0,0 +1,32 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置溶解氧告警值请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class ReqSetOxyWarnValue implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private Long deviceId;
+
+    /**
+     * 溶解氧下限告警值
+     */
+    @NotNull(message = "溶解氧下限告警值不能为空")
+    private Double oxyWarnLower;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqSetTempWarnValue.java

@@ -0,0 +1,38 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置温度告警值请求对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class ReqSetTempWarnValue implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private Long deviceId;
+
+    /**
+     * 温度上限告警值
+     */
+    @NotNull(message = "温度上限告警值不能为空")
+    private Double tempWarnUpper;
+
+    /**
+     * 温度下限告警值
+     */
+    @NotNull(message = "温度下限告警值不能为空")
+    private Double tempWarnLower;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqSetVoltageType.java

@@ -0,0 +1,32 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置开关电压类型请求对象
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class ReqSetVoltageType implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开关ID
+     */
+    @NotNull(message = "开关ID不能为空")
+    private Long id;
+
+    /**
+     * 电压类型（1-单相220V，4-三相380V四线）
+     */
+    @NotNull(message = "电压类型不能为空")
+    private Integer voltageType;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqSwitchElectricSet.java

@@ -0,0 +1,32 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置开关额定电流请求对象
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class ReqSwitchElectricSet implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开关ID
+     */
+    @NotNull(message = "开关ID不能为空")
+    private Long id;
+
+    /**
+     * 额定电流值（单位：A）
+     */
+    @NotNull(message = "额定电流值不能为空")
+    private Double electric;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqTurnOpen.java

@@ -0,0 +1,32 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 开关设置请求对象
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class ReqTurnOpen implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "ID不能为空")
+    private Long id;
+
+    /**
+     * 是否开启（0-关闭，1-开启）
+     */
+    @NotNull(message = "开关状态不能为空")
+    private Integer isOpen;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/ReqUpdateLinkedCtrl.java

@@ -0,0 +1,46 @@
+package com.intc.fishery.domain.bo;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 修改联动控制请求对象
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class ReqUpdateLinkedCtrl implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联动控制ID
+     */
+    @NotNull(message = "联动控制ID不能为空")
+    private Long id;
+
+    /**
+     * 溶解氧上限值
+     */
+    @NotNull(message = "溶解氧上限值不能为空")
+    private Double oxyWarnUpper;
+
+    /**
+     * 溶解氧下限值
+     */
+    @NotNull(message = "溶解氧下限值不能为空")
+    private Double oxyWarnLower;
+
+    /**
+     * 开关ID列表
+     */
+    @NotEmpty(message = "开关ID列表不能为空")
+    private List<Long> listSwitchId;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/dto/PublicDeviceSimpleDto.java

@@ -0,0 +1,45 @@
+package com.intc.fishery.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 设备简单信息DTO
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class PublicDeviceSimpleDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 开关列表
+     */
+    private List<PublicDeviceSwitchSimpleDto> listSwitch;
+
+    /**
+     * 设备告警状态码
+     */
+    private Integer warnCode;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/dto/PublicDeviceSwitchBaseData.java

@@ -0,0 +1,79 @@
+package com.intc.fishery.domain.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.intc.common.json.handler.DoubleSerializer;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 开关基础数据DTO
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class PublicDeviceSwitchBaseData implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开关ID
+     */
+    private Long id;
+
+    /**
+     * 序号
+     */
+    private Integer index;
+
+    /**
+     * 开关名称
+     */
+    private String switchName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 塘口信息
+     */
+    private PublicPondIdName pondInfo;
+
+    /**
+     * 当前测定电流
+     */
+    @JsonSerialize(using = DoubleSerializer.class)
+    private Double detectElectricValue;
+
+    /**
+     * 当前测定电压
+     */
+    @JsonSerialize(using = DoubleSerializer.class)
+    private Double detectVoltageValue;
+
+    /**
+     * 输入额定电压
+     */
+    private Integer inputVoltage;
+
+    /**
+     * 接线方式
+     */
+    private Integer connectVoltageType;
+
+    /**
+     * 电流告警开关
+     */
+    private Integer electricWarnOpen;
+
+    /**
+     * 额定电流设置
+     */
+    @JsonSerialize(using = DoubleSerializer.class)
+    private Double rateElectricValue;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/dto/PublicDeviceSwitchSimple.java

@@ -0,0 +1,34 @@
+package com.intc.fishery.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设备开关简单信息DTO（用于联动控制）
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class PublicDeviceSwitchSimple implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开关ID
+     */
+    private Long id;
+
+    /**
+     * 序号
+     */
+    private Integer index;
+
+    /**
+     * 开关名称
+     */
+    private String switchName;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/dto/PublicDeviceSwitchSimpleDto.java

@@ -0,0 +1,39 @@
+package com.intc.fishery.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设备开关简单信息DTO
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class PublicDeviceSwitchSimpleDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开关ID
+     */
+    private Long id;
+
+    /**
+     * 序号
+     */
+    private Integer index;
+
+    /**
+     * 开关名称
+     */
+    private String switchName;
+
+    /**
+     * 联动控制ID
+     */
+    private Long linkedCtrlId;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/dto/PublicLinkedCtrl.java

@@ -0,0 +1,55 @@
+package com.intc.fishery.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 联动控制信息DTO
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class PublicLinkedCtrl implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联动控制ID
+     */
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
+    /**
+     * 溶解氧上限开关
+     */
+    private Integer oxyUpperOpen;
+
+    /**
+     * 溶解氧上限值
+     */
+    private Double oxyUpperValue;
+
+    /**
+     * 溶解氧下限开关
+     */
+    private Integer oxyLowerOpen;
+
+    /**
+     * 溶解氧下限值
+     */
+    private Double oxyLowerValue;
+
+    /**
+     * 开关列表
+     */
+    private List<PublicDeviceSwitchSimple> listSwitch;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/dto/PublicPondIdName.java

@@ -0,0 +1,29 @@
+package com.intc.fishery.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 塘口ID和名称DTO
+ *
+ * @author intc
+ * @date 2025-01-13
+ */
+@Data
+public class PublicPondIdName implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 塘口ID
+     */
+    private Long id;
+
+    /**
+     * 塘口名称
+     */
+    private String pondName;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceSwitchVo.java

@@ -164,4 +164,34 @@ public class DeviceSwitchVo implements Serializable {
      */
     private Boolean hasErrorCode;
 
+    /**
+     * 设备到期时间（关联查询用）
+     */
+    private Date deadTime;
+
+    /**
+     * 设备告警状态码（关联查询用）
+     */
+    private Integer warnCode;
+
+    /**
+     * 设备IoT ID（关联查询用）
+     */
+    private String iotId;
+
+    /**
+     * 设备所属用户ID（关联查询用）
+     */
+    private Long userId;
+
+    /**
+     * 设备类型（关联查询用）
+     */
+    private Integer deviceType;
+
+    /**
+     * 设备输入电压类型（关联查询用）
+     */
+    private Integer inputVoltage;
+
 }

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/LinkedCtrlVo.java

@@ -109,5 +109,24 @@ public class LinkedCtrlVo implements Serializable {
     @ExcelProperty(value = "用户名")
     private String userName;
 
+    /**
+     * 用户ID（关联查询用）
+     */
+    private Long userId;
+
+    /**
+     * 塘口ID（关联查询用）
+     */
+    private Long pondId;
+
+    /**
+     * 设备告警状态码（关联查询用）
+     */
+    private Integer warnCode;
+
+    /**
+     * 设备到期时间（关联查询用）
+     */
+    private java.util.Date deadTime;
 
 }

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceBaseData.java

@@ -0,0 +1,121 @@
+package com.intc.fishery.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 设备基础数据视图对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class PublicDeviceBaseData implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备编号
+     */
+    private String serialNum;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 绑定时间
+     */
+    private Date bindTime;
+
+    /**
+     * 服务到期时间
+     */
+    private Date deadTime;
+
+    /**
+     * 塘口信息
+     */
+    private PublicPondIdNameVo pondInfo;
+
+    /**
+     * 溶解氧参数配置开关
+     */
+    private Integer isOxygenUsed;
+
+    /**
+     * 溶解氧电话告警开关
+     */
+    private Integer oxyWarnTelOpen;
+
+    /**
+     * 低溶氧告警免打扰
+     */
+    private Integer oxyWarnTelNoDis;
+
+    /**
+     * 溶解氧电话告警下限
+     */
+    private Double oxyWarnLower;
+
+    /**
+     * 温度电话告警开关
+     */
+    private Integer tempWarnTelOpen;
+
+    /**
+     * 温度告警免打扰
+     */
+    private Integer tempWarnTelNoDis;
+
+    /**
+     * 温度电话告警上限
+     */
+    private Double tempWarnUpper;
+
+    /**
+     * 温度电话告警下限
+     */
+    private Double tempWarnLower;
+
+    /**
+     * 盐度补偿
+     */
+    private Double salinityCompensation;
+
+    /**
+     * 输入额定电压
+     */
+    private Integer inputVoltage;
+
+    /**
+     * 电压告警开关
+     */
+    private Integer voltageWarnOpen;
+
+    /**
+     * 开关列表（仅测控一体机）
+     */
+    private List<PublicDeviceSwitchSimpleVo> listSwitch;
+
+    /**
+     * 联动控制列表
+     */
+    private List<PublicDeviceLinkedCtrl> listLinkedCtr;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceDeadInfo.java

@@ -0,0 +1,48 @@
+package com.intc.fishery.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 设备到期信息视图对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+@Schema(description = "设备到期信息")
+public class PublicDeviceDeadInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @Schema(description = "设备ID")
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    @Schema(description = "设备名称")
+    private String deviceName;
+
+    /**
+     * 设备序列号
+     */
+    @Schema(description = "设备序列号")
+    private String serialNum;
+
+    /**
+     * 服务到期时间
+     */
+    @Schema(description = "服务到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deadTime;
+}

intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceLinkedCtrl.java

@@ -0,0 +1,55 @@
+package com.intc.fishery.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 设备联动控制视图对象
+ *
+ * @author intc
+ * @date 2026-01-13
+ */
+@Data
+public class PublicDeviceLinkedCtrl implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联动控制ID
+     */
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
+    /**
+     * 溶解氧上限开关
+     */
+    private Integer oxyUpperOpen;
+
+    /**
+     * 溶解氧上限值
+     */
+    private Double oxyUpperValue;
+
+    /**
+     * 溶解氧下限开关
+     */
+    private Integer oxyLowerOpen;
+
+    /**
+     * 溶解氧下限值
+     */
+    private Double oxyLowerValue;
+
+    /**
+     * 关联的开关列表
+     */
+    private List<PublicDeviceSwitchSimpleVo> listSwitch;
+}