From 1aa915d30517212620ac06493b60dee4de56ba07 Mon Sep 17 00:00:00 2001
From: zhouhuang <assouan@sohu.com>
Date: Thu, 16 Jan 2025 13:36:54 +0800
Subject: [PATCH] update

---
 das-dn/cmg/ry.cpp                 |  4 ++--
 das-dn/zjd3100proc/zjd3100pro.cpp | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp
index bdbdd77c..e316611e 100644
--- a/das-dn/cmg/ry.cpp
+++ b/das-dn/cmg/ry.cpp
@@ -2845,7 +2845,7 @@ void CRYDevice::heart_beat(int status)
 #if 1
                 jsonValue["real"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
                 if ((config.processes[i].state & 0x20) == 0x20) {
-                    jsonValue["ftp"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
+                    jsonValue["ftp"] = (config.processes[i].ftp_softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
                 }
 #endif
                 jsonLink.append(jsonValue);
@@ -2871,7 +2871,7 @@ void CRYDevice::heart_beat(int status)
 #if 1
                 jsonValue["real"] = (config.units[i].real_softdog >= UNIT_WATCHDOG_TIME) ? false : true;
                 if ((config.units[i].state & 0x20) == 0x20) {
-                    jsonValue["ftp"] = (config.units[i].real_softdog >= UNIT_WATCHDOG_TIME) ? false : true;
+                    jsonValue["ftp"] = (config.units[i].ftp_softdog >= UNIT_WATCHDOG_TIME) ? false : true;
                 }
 #endif
                 jsonDevice.append(jsonValue);
diff --git a/das-dn/zjd3100proc/zjd3100pro.cpp b/das-dn/zjd3100proc/zjd3100pro.cpp
index db55ba2a..5315ac51 100644
--- a/das-dn/zjd3100proc/zjd3100pro.cpp
+++ b/das-dn/zjd3100proc/zjd3100pro.cpp
@@ -714,8 +714,16 @@ BOOLEAN CZJD3100Process::OnSyntanProcessInfo(char *pData, int ord)
             for (int i = 0; i < PROCESS_UNIT_NUM; i++)
             {
                 if (config.processes[pid].units[i] < 0) continue;
-                if (i == 0) snprintf(buffer, sizeof(buffer), "%d-%d", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
-                else snprintf(buffer, sizeof(buffer), ", %d-%d", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
+                if ((config.units[config.processes[pid].units[i]].state & 0x20) == 0x20)
+                {
+                    if (i == 0) snprintf(buffer, sizeof(buffer), "%d-<%d,%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog, config.units[config.processes[pid].units[i]].ftp_softdog);
+                    else snprintf(buffer, sizeof(buffer), ", %d-<%d,%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog, config.units[config.processes[pid].units[i]].ftp_softdog);
+                }
+                else
+                {
+                    if (i == 0) snprintf(buffer, sizeof(buffer), "%d-<%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
+                    else snprintf(buffer, sizeof(buffer), ", %d-<%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
+                }
                 pItem->WriteData((BYTE *)buffer, strlen(buffer), ord);
             }
             pItem->WriteData((BYTE *)"\r\n", strlen("\r\n"), ord);