Commit Graph

Select branches

Hide Pull Requests

20251013-版本v1.0

6170-protocol

fys-main

fys-prod

main

main-dyf

Mono Color

• ec28ab1092 设备协议 6170-protocol chenyouting 2025-11-10 08:37:42 +08:00
• df28eed305 prod配置文件 chenyouting 2025-10-28 10:51:05 +08:00
• 07e60cf7f0 Merge branch 'dyf-device' into 6170 daiyongfei 2025-10-28 10:33:15 +08:00
• 5d42f8a1e1 Merge branch 'jingquan' into dyf-device daiyongfei 2025-10-28 10:32:31 +08:00
• f2a5e63a41 Merge pull request 'feat(equipment): 添加阿里巴巴TTS语音合成工具类' (#18) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-28 10:31:37 +08:00
• 467a7befb1 提交2 chenyouting 2025-10-28 10:29:12 +08:00
• 107ddf8851 feat(app): 添加防重复提交注解 DragonWenLong 2025-10-27 09:00:36 +08:00
• a85e74c5e6 在线状态任务3 chenyouting 2025-10-25 08:35:25 +08:00
• 9bbddee1d5 feat(equipment): 添加阿里巴巴TTS语音合成工具类 DragonWenLong 2025-10-24 11:22:35 +08:00
• da0833a400 Merge remote-tracking branch 'origin/6170' into 6170 daiyongfei 2025-10-13 16:15:26 +08:00
• 418fb55bf0 导出电子围栏列表 daiyongfei 2025-10-13 14:25:07 +08:00
• 1d50981a84 在线状态任务2 chenyouting 2025-10-13 14:14:51 +08:00
• 2f80c450c5 最多同时加载5张图片 daiyongfei 2025-10-13 10:48:53 +08:00
• 09cbdf267b 设备绑定提示 chenyouting 2025-10-12 13:37:18 +08:00
• 156fdbb53b 历史轨迹mac地址支持模糊查询 chenyouting 2025-10-11 16:33:57 +08:00
• 3246127893 设备解绑 chenyouting 2025-10-11 16:16:06 +08:00
• dab0440128 绑定bug修复 chenyouting 2025-10-11 16:07:14 +08:00
• 740a638444 Merge pull request 'fix(device):修复SOS报警类型判断逻辑' (#17) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-11 13:35:08 +08:00
• a3d44a157a fix(device):修复SOS报警类型判断逻辑 DragonWenLong 2025-10-11 13:23:51 +08:00
• cc23f082a6 Merge remote-tracking branch 'upstream/6170' into 6170 chenyouting 2025-10-11 11:06:15 +08:00
• 1bc7dc676e 控制中心查询 chenyouting 2025-10-11 11:06:07 +08:00
• 5cdacad468 获取设备使用频次统计 daiyongfei 2025-10-11 10:32:16 +08:00
• 62af38cbf0 Merge branch 'dyf-device' into 6170 daiyongfei 2025-10-11 09:05:38 +08:00
• 04a21567aa 设备所属分组 daiyongfei 2025-10-11 09:04:48 +08:00
• 5b4fa38dbd 设备告警 chenyouting 2025-10-10 15:46:25 +08:00
• 2c3effa683 历史轨迹1 chenyouting 2025-10-10 09:26:52 +08:00
• 7b8c626cb6 Merge branch 'jingquan' into dyf-device daiyongfei 2025-10-09 14:45:15 +08:00
• 9642908035 Merge pull request 'feat(app): 实现系统版本管理功能-Dto 新增 SystemVersion 数据传输对象- 修改 AppAuthController 的 getAppVersion 接口，从 Redis 获取版本信息' (#16) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-09 14:44:18 +08:00
• 85b2e2b976 设备告警1 chenyouting 2025-10-09 13:31:37 +08:00
• 88ac0236bd feat(app): 实现系统版本管理功能-Dto 新增 SystemVersion 数据传输对象- 修改 AppAuthController 的 getAppVersion 接口，从 Redis 获取版本信息 - 新增 DeviceXinghanController 的 VersionSettings 接口，用于更新版本信息到 Redis- 引入 FastJSON 和 Redis 工具类支持版本信息的序列化与缓存 - 添加权限注解控制版本更新接口访问 - 定义全局 Redis 键常量用于版本信息存储 DragonWenLong 2025-10-09 11:09:07 +08:00
• 609a3e4058 设备在线状态2 chenyouting 2025-10-09 09:44:48 +08:00
• 68cf78f3f2 设备在线状态5 chenyouting 2025-10-08 17:27:43 +08:00
• c9857a679c 设备在线状态4 chenyouting 2025-10-08 15:08:31 +08:00
• 6439a96e3d 设备在线状态3 chenyouting 2025-10-08 15:07:54 +08:00
• 9f0155a6e3 Merge branch 'dyf-device' into 6170 daiyongfei 2025-10-08 14:12:09 +08:00
• 6c99cef65d 解除告警 daiyongfei 2025-10-08 14:11:11 +08:00
• 840c4fd68f 设备在线状态2 chenyouting 2025-10-08 13:53:03 +08:00
• dc0fe96652 设备在线状态 daiyongfei 2025-10-08 13:38:07 +08:00
• cf883bfa00 Merge remote-tracking branch 'upstream/6170' into 6170 chenyouting 2025-10-08 11:48:16 +08:00
• 6a6397da23 控制查询条件加模糊查询 chenyouting 2025-10-08 11:48:05 +08:00
• d701a834b3 设备IMEI 模糊查询 daiyongfei 2025-10-08 09:37:18 +08:00
• e1ac87e5f2 在线状态 daiyongfei 2025-10-07 16:11:06 +08:00
• 5c3a35c83e 在线状态 daiyongfei 2025-10-07 16:09:59 +08:00
• 2c0eff2b2c Merge remote-tracking branch 'origin/6170' into 6170 daiyongfei 2025-10-07 15:50:26 +08:00
• 37e07d2706 控制中心优化2 chenyouting 2025-10-07 15:50:16 +08:00
• 5c0c4e40e4 Merge pull request 'fix(device):优化Redis缓存更新逻辑' (#15) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-10-07 15:46:56 +08:00
• eceedae676 fix(device):优化Redis缓存更新逻辑 DragonWenLong 2025-10-07 15:29:19 +08:00
• dfa5b446f9 控制中心优化 chenyouting 2025-10-07 09:50:49 +08:00
• 9afc0222d5 app批量上传logo chenyouting 2025-09-30 17:53:28 +08:00
• 2cfcea65f1 Merge branch '6170' into dyf-device daiyongfei 2025-09-30 16:10:13 +08:00
• 9b72a6ebd2 Merge pull request 'feat(device): 新增设备类型查询与设备添加功能' (#14) from liwenlong/fys-Multi-tenant:jingquan into jingquan dyf 2025-09-30 16:06:10 +08:00
• 13db094336 feat(device): 新增设备类型查询与设备添加功能 DragonWenLong 2025-09-30 15:59:24 +08:00
• a1d6604520 app产品参数修改 chenyouting 2025-09-30 15:42:59 +08:00
• b0e51e73c7 岗位信息1 chenyouting 2025-09-30 13:21:43 +08:00
• dba537b83f 发送信息和告警故障5 chenyouting 2025-09-30 09:57:45 +08:00
• d9b69ddc4e 不同的一级目录下的分组应当可以重名 daiyongfei 2025-09-29 17:53:26 +08:00
• 6cec86bafe Merge remote-tracking branch 'upstream/6170' into jingquan chenyouting 2025-09-29 13:57:29 +08:00
• 608aa8449a Merge branch 'main' into dyf-device daiyongfei 2025-09-29 09:26:49 +08:00
• 6084f11e62 Merge pull request 'jingquan' (#13) from liwenlong/fys-Multi-tenant:jingquan into main dyf 2025-09-29 09:26:04 +08:00
• 994e63bcde Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170 daiyongfei 2025-09-29 09:24:52 +08:00
• d6520d777a 发送信息和告警故障4 chenyouting 2025-09-29 09:17:20 +08:00
• 1898fe5db9 Merge branch '6170' into dyf-device daiyongfei 2025-09-28 18:19:21 +08:00
• 7d56e2e80e 发送信息和告警故障3 chenyouting 2025-09-28 17:18:47 +08:00
• 233e0e32b0 发送信息和告警故障2 chenyouting 2025-09-28 16:19:28 +08:00
• cb2acdb3f4 Merge remote-tracking branch 'liwenlong-fys/jingquan' into jingquan DragonWenLong 2025-09-28 16:11:52 +08:00
• a4596b9c90 feat(device): 实现设备批量控制指令发送功能- 新增批量发送设备控制指令方法 sendCommandBatch- 支持设备离线状态检查和异常处理 - 添加设备操作日志记录和报警创建- 实现设备SOS档位批量设置接口 - 在设备指令处理中增加消息去重机制 - 优化设备报警处理的分布式锁逻辑 - 完善设备数据规则中的并发控制 DragonWenLong 2025-09-28 16:11:34 +08:00
• 5230a95865 自动报警 daiyongfei 2025-09-28 15:28:19 +08:00
• 4d2b7c6adf 设备是否正在告警 daiyongfei 2025-09-28 11:53:24 +08:00
• 461fd9364c Merge remote-tracking branch 'upstream/6170' into 6170 chenyouting 2025-09-27 15:40:39 +08:00
• ad81647939 发送信息和告警故障 chenyouting 2025-09-27 15:40:31 +08:00
• 2d59397de5 大屏数据 daiyongfei 2025-09-27 15:30:12 +08:00
• b7c81419a4 围栏进出记录-导出-报错 daiyongfei 2025-09-26 11:48:20 +08:00
• 3859c20081 Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-26 09:33:07 +08:00
• 3bdabb04e2 设备列表-导出excel 缺少绑定状态，excel表头顺序按列表展示 daiyongfei 2025-09-26 09:32:42 +08:00
• e124694e67 Merge branch 'main' into dyf-device daiyongfei 2025-09-26 08:36:00 +08:00
• e528cd04e9 Merge pull request 'jingquan' (#12) from liwenlong/fys-Multi-tenant:jingquan into main dyf 2025-09-26 08:34:05 +08:00
• 735199b9e0 控制中心查询3 chenyouting 2025-09-25 10:58:57 +08:00
• a69c665d8b 控制中心查询2 chenyouting 2025-09-25 10:58:25 +08:00
• 5a52129fd0 控制中心查询 chenyouting 2025-09-25 09:21:11 +08:00
• 7eb5e6095a feat(device): 新增报警类型枚举并优化设备指令处理逻辑 DragonWenLong 2025-09-25 08:31:32 +08:00
• 91f0241181 feat(mqtt): 添加电池电量百分比字段并适配控制列表显示 DragonWenLong 2025-09-23 15:55:01 +08:00
• baa341c2bf feat(equipment): 实现设备维修记录图片管理和报警处理功能 DragonWenLong 2025-09-23 14:21:05 +08:00
• 9c98fa9077 Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-23 13:58:09 +08:00
• 89f08c2d91 导入导出设备数据 daiyongfei 2025-09-23 13:56:34 +08:00
• 135e6d6899 设备分享 chenyouting 2025-09-23 11:42:44 +08:00
• 49e9066033 feat(equipment): 实现设备维修记录图片管理和报警处理功能 DragonWenLong 2025-09-23 11:31:11 +08:00
• e2821566c8 事件地址 daiyongfei 2025-09-22 18:18:05 +08:00
• 5b3a92c80d 查询所有设备类型 daiyongfei 2025-09-22 16:34:32 +08:00
• 9d642f4913 分页查询围栏进出记录列表 daiyongfei 2025-09-22 15:58:00 +08:00
• f07ec53645 控制中心设备绑定修改3 chenyouting 2025-09-22 14:05:39 +08:00
• 74b0059aca 控制中心设备绑定修改2 chenyouting 2025-09-22 14:03:44 +08:00
• 8e66f1ca28 控制中心设备绑定修改 chenyouting 2025-09-22 12:41:54 +08:00
• 1b33356a2a 在线状态修改 chenyouting 2025-09-22 11:02:26 +08:00
• 5f36c25550 内容（报警信息） daiyongfei 2025-09-20 14:35:23 +08:00
• 9058dcfcb1 设备告警 daiyongfei 2025-09-20 11:45:11 +08:00
• 3e19cd9db2 设置图片路径 daiyongfei 2025-09-19 09:43:52 +08:00
• 397f227bfb Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-18 15:26:04 +08:00
• 1b2bf542fa 个人中心修改密码2 chenyouting 2025-09-18 15:25:32 +08:00
• 7d4bc1f8ad Merge branch 'liwenlong-jingquan' daiyongfei 2025-09-18 12:03:43 +08:00
• 4d9038567f 根据提供的代码差异信息，以下是符合Angular commit规范的commit message： DragonWenLong 2025-09-18 11:40:12 +08:00