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-07-11 19:16:18 +08:00
parent c3cb49a156
commit 0d34efdfa7
8 changed files with 187 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
intc-modules/intc-iot/src/main/java/com/intc/iot/controller/IotController.java
View File

@@ -1151,11 +1151,12 @@ public class IotController extends BaseController {
device.setIotId(iotId);
device.setSerialNum(bo.getSerialNum());
device.setDeviceType(2); // 2-测控一体机
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000)); // 一年后到期
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000));
} else {
// 检查是否已过期
if (device.getDeadTime() != null && now.after(device.getDeadTime())) {
warnCode |= DefineDeviceWarnCode.DeviceTimeDead;
// 管理员解绑会清空有效期(null)，普通用户解绑会保留有效期。仅null时才设置365天
if (device.getDeadTime() == null) {
log.info("测控一体机重新绑定，有效期已被管理员解绑清空，重新设置: serialNum={}", bo.getSerialNum());
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000));
}
}
@@ -1575,12 +1576,13 @@ public class IotController extends BaseController {
device.setIotId(iotId);
device.setSerialNum(bo.getSerialNum());
device.setDeviceType(1); // 1-水质检测仪
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000)); // 一年后到期
device.setIsOxygenUsed(1);
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000));
} else {
// 检查是否已过期
if (device.getDeadTime() != null && now.after(device.getDeadTime())) {
warnCode |= DefineDeviceWarnCode.DeviceTimeDead;
// 管理员解绑会清空有效期(null)，普通用户解绑会保留有效期。仅null时才设置365天
if (device.getDeadTime() == null) {
log.info("水质检测仪重新绑定，有效期已被管理员解绑清空，重新设置: serialNum={}", bo.getSerialNum());
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000));
}
}
@@ -1832,7 +1834,13 @@ public class IotController extends BaseController {
device.setIotId(iotId);
device.setSerialNum(bo.getSerialNum());
device.setDeviceType(3); // 3-太阳能网控
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000)); // 一年后到期
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000));
} else {
// 管理员解绑会清空有效期(null)，普通用户解绑会保留有效期。仅null时才设置365天
if (device.getDeadTime() == null) {
log.info("太阳能网控重新绑定，有效期已被管理员解绑清空，重新设置: serialNum={}", bo.getSerialNum());
device.setDeadTime(new Date(now.getTime() + 365L * 24 * 60 * 60 * 1000));
}
}
// 设置基本信息