diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java index 3cc67c9..519e16c 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java @@ -197,14 +197,14 @@ public class DeviceController extends BaseController { * 清零设备测试数据(出厂测试用) *

清理范围: *

- * 清零后,设备重新绑定时会自动重新计算365天有效期。

+ * deadTime 置空作为出厂清零标记,下一次绑定时重新计算 365 天有效期;其他必填数值字段清零为 0,不置空。

* * @param id 设备ID * @return 操作结果 @@ -222,19 +222,20 @@ public class DeviceController extends BaseController { String serialNum = device.getSerialNum(); - // 1. 清零设备表:有效期、告警状态、实时传感器值、最后上数时间 + // 1. 清零设备表:解除绑定、清空有效期作为重新计费标记,必填数值字段清零为 0 deviceMapper.update(null, new LambdaUpdateWrapper() .eq(Device::getId, id) + .set(Device::getUserId, null) + .set(Device::getPondId, null) .set(Device::getDeadTime, null) .set(Device::getWarnCode, DefineDeviceWarnCode.None) - .set(Device::getLastReportTime, null) - .set(Device::getValueDissolvedOxygen, null) - .set(Device::getValueTemperature, null) - .set(Device::getValueSaturability, null) - .set(Device::getValuePh, null) - .set(Device::getValueSalinity, null) - .set(Device::getValueBattery, null) + .set(Device::getValueDissolvedOxygen, 0.0) + .set(Device::getValueTemperature, 0.0) + .set(Device::getValueSaturability, 0.0) + .set(Device::getValuePh, 0.0) + .set(Device::getValueSalinity, 0.0) + .set(Device::getValueBattery, 0) .set(Device::getIsOxygenWarnExist, 0) .set(Device::getIsTempWarnExist, 0) );