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-15 11:35:13 +08:00
parent 15af17fb95
commit fe0f3e0432
23 changed files with 1797 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,48 @@
package com.intc.fishery.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 添加定时控制请求对象
*
* @author intc
* @date 2026-01-14
*/
@Data
public class ReqAddTimeCtrl implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 开关ID
*/
@NotNull(message = "开关ID不能为空")
private Long id;
/**
* 开启时间（只包含时分）
*/
@NotNull(message = "开启时间不能为空")
@JsonFormat(pattern = "HH:mm")
private Date openTime;
/**
* 关闭时间（只包含时分）
*/
@NotNull(message = "关闭时间不能为空")
@JsonFormat(pattern = "HH:mm")
private Date closeTime;
/**
* 循环类型
*/
@NotNull(message = "循环类型不能为空")
private Integer loopType;
}

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

@@ -0,0 +1,32 @@
package com.intc.fishery.domain.bo;
import com.intc.common.core.constant.RegexConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 添加子用户请求对象
*
* @author intc
* @date 2026-01-14
*/
@Data
@Schema(description = "添加子用户请求对象")
public class ReqAddUserChild implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 子用户手机号
*/
@Schema(description = "子用户手机号")
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确")
private String mobilePhone;
}

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

@@ -0,0 +1,47 @@
package com.intc.fishery.domain.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
import com.intc.common.core.constant.RegexConstants;
import java.io.Serial;
import java.io.Serializable;
/**
* 更新手机号请求对象
*
* @author intc
* @date 2026-01-14
*/
@Data
@Schema(description = "更新手机号请求对象")
public class ReqUpdatePhone implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 旧手机号
*/
@Schema(description = "旧手机号")
@NotBlank(message = "旧手机号不能为空")
@Pattern(regexp = RegexConstants.MOBILE, message = "旧手机号格式不正确")
private String oldMobilePhone;
/**
* 新手机号
*/
@Schema(description = "新手机号")
@NotBlank(message = "新手机号不能为空")
@Pattern(regexp = RegexConstants.MOBILE, message = "新手机号格式不正确")
private String newMobilePhone;
/**
* 短信验证码
*/
@Schema(description = "短信验证码")
@NotBlank(message = "短信验证码不能为空")
private String smsCode;
}

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

@@ -0,0 +1,32 @@
package com.intc.fishery.domain.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
import com.intc.common.core.constant.RegexConstants;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 更新报警电话请求对象
*
* @author intc
* @date 2026-01-14
*/
@Data
@Schema(description = "更新报警电话请求对象")
public class ReqUpdateWarnPhone implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 报警电话列表
*/
@Schema(description = "报警电话列表")
@NotEmpty(message = "报警电话列表不能为空")
private List<@Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") String> listPhone;
}

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

@@ -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.Pattern;
import lombok.Data;
import com.intc.common.core.constant.RegexConstants;
import java.io.Serial;
import java.io.Serializable;
/**
* 验证短信验证码请求对象
*
* @author intc
* @date 2026-01-14
*/
@Data
@Schema(description = "验证短信验证码请求对象")
public class ReqVerifySmsCode implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 手机号
*/
@Schema(description = "手机号")
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确")
private String mobilePhone;
/**
* 短信验证码
*/
@Schema(description = "短信验证码")
@NotBlank(message = "短信验证码不能为空")
private String smsCode;
}

15
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PondDeviceListVo.java
View File

@@ -18,6 +18,21 @@ public class PondDeviceListVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 塘口ID
*/
private Long pondId;
/**
* 塘口名称
*/
private String pondName;
/**
* 夜间防误关（0-关闭，1-开启）
*/
private Integer keepNightOpen;
/**
* 探测器列表（水质检测仪）
*/

29
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceTypeAndSerialNum.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;
/**
* 设备类型和序列号视图对象
*
* @author intc
* @date 2026-01-14
*/
@Data
public class PublicDeviceTypeAndSerialNum implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 设备类型（1-水质检测仪，2-控制一体机）
*/
private Integer deviceType;
/**
* 设备序列号
*/
private String serialNum;
}

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

@@ -0,0 +1,53 @@
package com.intc.fishery.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 定时控制视图对象
*
* @author intc
* @date 2026-01-14
*/
@Data
public class PublicTimeCtrl implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
private Long id;
/**
* 开关ID
*/
private Long switchId;
/**
* 开启时间
*/
@JsonFormat(pattern = "HH:mm:ss")
private Date openTime;
/**
* 关闭时间
*/
@JsonFormat(pattern = "HH:mm:ss")
private Date closeTime;
/**
* 循环类型
*/
private Long loopType;
/**
* 是否启用
*/
private Long isOpen;
}

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

@@ -0,0 +1,54 @@
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.time.LocalDateTime;
/**
* 子用户关系视图对象
*
* @author intc
* @date 2026-01-14
*/
@Data
@Schema(description = "子用户关系视图对象")
public class UserChildVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 关系表主键id
*/
@Schema(description = "关系表主键id")
private Long id;
/**
* 子账号用户id
*/
@Schema(description = "子账号用户id")
private Long userId;
/**
* 子账号用户名
*/
@Schema(description = "子账号用户名")
private String userName;
/**
* 子账号手机号
*/
@Schema(description = "子账号手机号")
private String mobilePhone;
/**
* 关系创建时间
*/
@Schema(description = "关系创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createdTime;
}