From 65bddd51668b8b161cdf1a55cd7ddfe465758b3e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Tue, 14 Jul 2026 11:34:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E9=9B=B6=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fishery/controller/DeviceController.java  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

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 {
      * 清零设备测试数据（出厂测试用）
      * <p>清理范围：
      * <ul>
-     *   <li>有效期(deadTime)、告警状态(warnCode)、实时传感器值、最后上数时间</li>
+     *   <li>用户/塘口绑定关系、有效期(deadTime)、告警状态(warnCode)、实时传感器值</li>
      *   <li>TDengine时序数据（删除设备子表，清除所有历史传感器数据）</li>
      *   <li>设备绑定/解绑记录</li>
      *   <li>设备校准记录</li>
      *   <li>设备故障码记录</li>
      *   <li>Redis告警标记</li>
      * </ul>
-     * 清零后，设备重新绑定时会自动重新计算365天有效期。</p>
+     * deadTime 置空作为出厂清零标记，下一次绑定时重新计算 365 天有效期；其他必填数值字段清零为 0，不置空。</p>
      *
      * @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<Device>()
                 .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)
         );