Commit Graph

Select branches

Hide Pull Requests

6170

APP权限登录改造

dyf-device

jingquan

main

prod

#20

#21

#22

Mono Color

• 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
• 630c6a8a35 角色管理员 daiyongfei 2025-09-18 11:25:40 +08:00
• 11e48acc81 个人中心修改密码 chenyouting 2025-09-18 08:54:29 +08:00
• 540a6fc1da 密码长度验证 chenyouting 2025-09-17 17:43:17 +08:00
• aeea8f9072 登录优化 chenyouting 2025-09-17 10:56:25 +08:00
• b463e97d28 配置文件mqtt端口修改 chenyouting 2025-09-16 17:35:29 +08:00
• e1b147b6be Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-16 17:05:19 +08:00
• 23b48cfb06 设备告警 daiyongfei 2025-09-16 17:04:45 +08:00
• 4106260e5f 在线状态修改优化4 chenyouting 2025-09-15 17:49:28 +08:00
• 07449e4a1e 查询围栏进出记录列表 daiyongfei 2025-09-15 16:49:38 +08:00
• b278a3087e 报警事项 daiyongfei 2025-09-15 14:59:08 +08:00
• dca5a6c48d 在线状态修改优化3 chenyouting 2025-09-15 09:43:15 +08:00
• 15b3348989 Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-15 09:41:56 +08:00
• 9fbb0aefcf 检查设备位置与围栏的关系 daiyongfei 2025-09-15 09:41:10 +08:00
• 4004aa1090 在线状态修改优化2 chenyouting 2025-09-13 16:51:56 +08:00
• 39c8375f08 在线状态修改优化 chenyouting 2025-09-13 16:46:05 +08:00
• 64c81ac44e 在线状态修改2 chenyouting 2025-09-13 15:51:34 +08:00
• 41eb3d9a33 在线状态修改 chenyouting 2025-09-13 15:37:48 +08:00
• 8597dc5a9f 导出围栏进出记录列表 daiyongfei 2025-09-12 14:50:42 +08:00
• 01a1a6e25b 查询围栏进出记录 daiyongfei 2025-09-12 11:48:39 +08:00
• 1722f92328 电子围栏-位置检查 daiyongfei 2025-09-12 09:04:47 +08:00
• ee8840d657 Merge remote-tracking branch 'origin/6170' into 6170 daiyongfei 2025-09-11 14:43:02 +08:00
• 9b84296419 Merge branch 'main' into dyf-device daiyongfei 2025-09-11 14:41:41 +08:00
• d48c7b389e Merge pull request 'jingquan' (#10) from liwenlong/fys-Multi-tenant:jingquan into main dyf 2025-09-11 14:40:23 +08:00
• ccdc25595d Merge remote-tracking branch 'origin/6170' into 6170 chenyouting 2025-09-11 14:38:06 +08:00
• f1aad91421 修改绑定1 chenyouting 2025-09-11 14:37:40 +08:00
• e2274bdf09 feat(web): 新增设备联调中心功能 DragonWenLong 2025-09-11 11:07:58 +08:00
• 8a127b9d2d Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-11 10:56:29 +08:00
• b8af6b511c 电子围栏 daiyongfei 2025-09-11 10:54:56 +08:00
• 6bc1d5b20b 绑定设备 daiyongfei 2025-09-10 09:56:39 +08:00
• 228e26df7f merge upstream liwenlong 2025-09-09 17:23:23 +08:00
• 801b0267e6 设备分享3 chenyouting 2025-09-09 17:01:51 +08:00
• fcbde4322d 今日报警总数 daiyongfei 2025-09-09 16:39:43 +08:00
• 832234269d 获取设备使用数据 daiyongfei 2025-09-09 16:06:34 +08:00