From 1f35e8fc81074a728e0ce89c0854418b95da5aeb Mon Sep 17 00:00:00 2001 From: zhihao Date: Fri, 26 Dec 2025 17:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=20`tbl=5Fr?= =?UTF-8?q?oomvisitlogform`=20=E8=A1=A8=E6=96=B0=E5=A2=9E=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=94=AF=E6=8C=81=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/Controllers/UpgradeController.cs | 16 +++++++--- 更新日志.md | 48 ++++++++++++++++++++++++----- 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/UI/Controllers/UpgradeController.cs b/UI/Controllers/UpgradeController.cs index e86fca4..199bfbe 100644 --- a/UI/Controllers/UpgradeController.cs +++ b/UI/Controllers/UpgradeController.cs @@ -569,9 +569,11 @@ namespace UI.Controllers /// public class EquipmentInfo { - public string EquipmentStatus { get; set; } // 设备状态 - public string FaultDescription { get; set; } // 故障描述 - public string DevName { get; set; } // 设备名称 + public string EquipmentStatus { get; set; } + public string FaultDescription { get; set; } + public string DevName { get; set; } + public string EquipmentStatusType { get; set; } + public string EquipmentOnlineStatus { get; set; } } private class RoomVisitLogFormRow @@ -582,6 +584,8 @@ namespace UI.Controllers public string FaultDescription { get; set; } public string UpdateDate { get; set; } public string DevName { get; set; } + public string EquipmentStatusType { get; set; } + public string EquipmentOnlineStatus { get; set; } } /// @@ -616,7 +620,9 @@ namespace UI.Controllers EquipmentStatus = equipment.EquipmentStatus, FaultDescription = equipment.FaultDescription, UpdateDate = updateDate, - DevName = equipment.DevName + DevName = equipment.DevName, + EquipmentStatusType = equipment.EquipmentStatusType, + EquipmentOnlineStatus = equipment.EquipmentOnlineStatus }).ToList(); // 批量写入数据库 @@ -693,7 +699,7 @@ namespace UI.Controllers } // 构建完整的SQL查询语句 - string sql = $"SELECT ID, HotelID, RoomNumber, EquipmentStatus, FaultDescription, UpdateDate, DevName FROM tbl_roomvisitlogform {whereClause} ORDER BY UpdateDate DESC"; + string sql = $"SELECT ID, HotelID, RoomNumber, EquipmentStatus, FaultDescription, UpdateDate, DevName, EquipmentStatusType, EquipmentOnlineStatus FROM tbl_roomvisitlogform {whereClause} ORDER BY UpdateDate DESC"; // 执行查询 var result = SqlSugarBase.RcuDb.Ado.SqlQuery(sql, parameters); diff --git a/更新日志.md b/更新日志.md index 858d690..59c4c08 100644 --- a/更新日志.md +++ b/更新日志.md @@ -25,6 +25,8 @@ | EquipmentStatus | string | 否 | 设备状态 | | FaultDescription | string | 否 | 故障描述 | | DevName | string | 否 | 设备名称 | +| EquipmentStatusType | string | 否 | 设备状态类型 | +| EquipmentOnlineStatus | string | 否 | 设备在线状态 | **返回结果**： ```json @@ -42,12 +44,14 @@ ```sql CREATE TABLE `tbl_roomvisitlogform` ( `ID` int NOT NULL AUTO_INCREMENT, - `HotelID` varchar(254) DEFAULT NULL COMMENT '酒店id', - `RoomNumber` varchar(254) DEFAULT NULL COMMENT '房号', - `EquipmentStatus` varchar(254) DEFAULT NULL COMMENT '设备状态', - `FaultDescription` varchar(254) DEFAULT NULL COMMENT '故障描述', - `UpdateDate` varchar(254) DEFAULT NULL COMMENT '更新时间', - `DevName` varchar(254) DEFAULT NULL COMMENT '设备名称', + `HotelID` varchar(254) DEFAULT NULLCOMMENT '酒店id', + `RoomNumber` varchar(254)DEFAULT NULL COMMENT '房号', + `EquipmentStatus` varchar(254)DEFAULT NULL COMMENT '设备状态', + `FaultDescription` varchar(254)DEFAULT NULL COMMENT '故障描述', + `UpdateDate` varchar(254)DEFAULT NULL COMMENT '更新时间', + `DevName` varchar(254)DEFAULT NULL COMMENT '设备名称', + `EquipmentStatusType` varchar(254)DEFAULT NULL COMMENT '设备状态类型', + `EquipmentOnlineStatus` varchar(254)DEFAULT NULL COMMENT '设备在线状态', PRIMARY KEY (`ID`), KEY `idx_hotel_room` (`HotelID`,`RoomNumber`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 @@ -180,4 +184,34 @@ fetch('/Upgrade/QueryRoomVisitLog', { 系统开发团队 **备注**： -该接口用于查询房间设备的访问和状态信息，支持按时间范围筛选，方便进行历史记录查询和分析。 \ No newline at end of file +该接口用于查询房间设备的访问和状态信息，支持按时间范围筛选，方便进行历史记录查询和分析。 + +#### 3. 设备状态类型和在线状态字段更新 + +**更新时间**：2025-12-26 + +**更新内容**： +`tbl_roomvisitlogform` 表新增两个字段，接口同步支持： + +| 字段名|类型|描述| +|---|---|---| +|EquipmentStatusType|varchar(254)|设备状态类型| +|EquipmentOnlineStatus|varchar(254)|设备在线状态| + +**修改文件**： +`UI/Controllers/UpgradeController.cs` + +**修改内容**： +- `EquipmentInfo`类新增 `EquipmentStatusType`和 `EquipmentOnlineStatus`属性 +- `RoomVisitLogFormRow`类新增对应字段 +- `WriteRoomVisitLog`接口支持写入新字段数据 +- `QueryRoomVisitLog`接口查询结果包含新字段 + +**数据库更新**： +```sql +ALTER TABLE `tbl_roomvisitlogform` ADD COLUMN `EquipmentStatusType` varchar(254) DEFAULT NULL COMMENT '设备状态类型'; +ALTER TABLE `tbl_roomvisitlogform` ADD COLUMN `EquipmentOnlineStatus` varchar(254) DEFAULT NULL COMMENT '设备在线状态'; +``` + +**开发人员**： +技术团队