qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tianyongbao
2026-01-12 18:47:11 +08:00
parent 38ba328966
commit a41248e405
22 changed files with 2060 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/bo/PondSelectDeviceOrSwitchBo.java Normal file
View File

@@ -0,0 +1,35 @@
package com.intc.fishery.domain.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 塘口选择设备或开关请求对象
*
* @author intc
* @date 2026-01-12
*/
@Data
public class PondSelectDeviceOrSwitchBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 塘口ID
*/
private Long pondId;
/**
* 探测器(水质检测仪)ID列表
*/
private List<Long> listDetectorId;
/**
* 开关ID列表
*/
private List<Long> listSwitchId;
}

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

@@ -154,4 +154,14 @@ public class DeviceSwitchVo implements Serializable {
private Date updateTime;
/**
* 是否有定时控制
*/
private Boolean isTimingCtrl;
/**
* 是否有故障码
*/
private Boolean hasErrorCode;
}

5
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java
View File

@@ -341,4 +341,9 @@ public class DeviceVo implements Serializable {
private Date updateTime;
/**
* 是否有联动控制
*/
private Boolean isLinkCtrl;
}

35
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceWithSwitchVo.java Normal file
View File

@@ -0,0 +1,35 @@
package com.intc.fishery.domain.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.intc.common.json.handler.DoubleSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
* 带开关列表的设备视图对象
*
* @author intc
* @date 2026-01-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class DeviceWithSwitchVo extends DeviceVo {
/**
* 开关列表（仅测控一体机有）
*/
private List<DeviceSwitchVo> listSwitch;
/**
* 故障信息
*/
private String errorMessage;
/**
* 告警码信息
*/
private PondMode1WarnCodeInfo warnCodeInfo;
}

30
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PondDeviceListVo.java Normal file
View File

@@ -0,0 +1,30 @@
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-12
*/
@Data
public class PondDeviceListVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 探测器列表（水质检测仪）
*/
private List<DeviceVo> listDetector;
/**
* 控制器列表（测控一体机，包含开关列表）
*/
private List<DeviceWithSwitchVo> listController;
}

27
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PondMode1WarnCodeInfo.java Normal file
View File

@@ -0,0 +1,27 @@
package com.intc.fishery.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 塘口告警码信息
*
* @author intc
*/
@Data
public class PondMode1WarnCodeInfo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 告警码
*/
private Integer warnCode;
/**
* 告警描述
*/
private String warnDescription;
}

56
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceSimpleVo.java Normal file
View File

@@ -0,0 +1,56 @@
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-12
*/
@Data
public class PublicDeviceSimpleVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 设备ID
*/
private Long id;
/**
* 设备名称
*/
private String deviceName;
/**
* 设备类型
*/
private Integer deviceType;
/**
* 服务到期时间
*/
private Date deadTime;
/**
* 溶解氧参数配置开关
*/
private Integer isOxygenUsed;
/**
* 塘口信息
*/
private PublicPondIdNameVo pondInfo;
/**
* 开关列表
*/
private List<PublicDeviceSwitchSimpleVo> listSwitch;
}

39
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceSwitchSimpleVo.java Normal file
View File

@@ -0,0 +1,39 @@
package com.intc.fishery.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 设备开关简化视图对象
*
* @author intc
* @date 2026-01-12
*/
@Data
public class PublicDeviceSwitchSimpleVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 开关ID
*/
private Long id;
/**
* 序号
*/
private Integer index;
/**
* 开关名称
*/
private String switchName;
/**
* 塘口信息
*/
private PublicPondIdNameVo pondInfo;
}

29
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicPondIdNameVo.java Normal file
View File

@@ -0,0 +1,29 @@
package com.intc.fishery.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 塘口ID和名称视图对象
*
* @author intc
* @date 2026-01-12
*/
@Data
public class PublicPondIdNameVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 塘口ID
*/
private Long id;
/**
* 塘口名称
*/
private String pondName;
}

98
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicPondMode1Vo.java Normal file
View File

@@ -0,0 +1,98 @@
package com.intc.fishery.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 塘口模式1视图对象 - 用于首页展示
*
* @author intc
*/
@Data
public class PublicPondMode1Vo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 塘口ID
*/
private Long id;
/**
* 塘口名称
*/
private String pondName;
/**
* 设备数量
*/
private Integer deviceCount;
/**
* 开关数量
*/
private Integer switchCount;
/**
* 开启的开关数量
*/
private Integer switchOpenCount;
/**
* 是否全部设备离线/失联
*/
private Boolean isAllDead;
/**
* 溶解氧(最大值)
*/
private Double valueDissolvedOxygen;
/**
* 水温(最大值)
*/
private Double valueTemperature;
/**
* 饱和度(最大值)
*/
private Double valueSaturability;
/**
* PH值(最大值)
*/
private Double valuePH;
/**
* 盐度(最大值)
*/
private Double valueSalinity;
/**
* 故障信息
*/
private String errorMessage;
/**
* 告警码信息
*/
private PondMode1WarnCodeInfo warnCodeInfo;
public PublicPondMode1Vo() {
this.deviceCount = 0;
this.switchCount = 0;
this.switchOpenCount = 0;
this.isAllDead = true;
this.valueDissolvedOxygen = 0.0;
this.valueTemperature = 0.0;
this.valueSaturability = 0.0;
this.valuePH = 0.0;
this.valueSalinity = 0.0;
this.errorMessage = "";
this.warnCodeInfo = new PondMode1WarnCodeInfo();
this.warnCodeInfo.setWarnCode(0);
this.warnCodeInfo.setWarnDescription("");
}
}