Commit Graph

Select branches

Hide Pull Requests

6170

APP权限登录改造

dyf-device

jingquan

main

prod

#20

Mono Color

• 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
• 7e87971c0b 新增绑定设备 daiyongfei 2025-09-09 15:02:46 +08:00
• ebd8668178 在线设备 daiyongfei 2025-09-09 11:03:38 +08:00
• 5e3307d2b0 设备分享2 chenyouting 2025-09-09 10:29:51 +08:00
• 040e44984e Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-09 10:01:26 +08:00
• f7a82ef138 设备操作记录 分页 daiyongfei 2025-09-09 09:55:58 +08:00
• 91f787eec7 pageQuery daiyongfei 2025-09-08 17:37:01 +08:00
• 870f94b2d4 开始时间 daiyongfei 2025-09-08 16:12:02 +08:00
• 395b2957c1 Merge remote-tracking branch 'origin/6170' into 6170 chenyouting 2025-09-06 16:19:35 +08:00
• 64a4485ced 设备分享 chenyouting 2025-09-06 16:19:12 +08:00
• 1e4ee840a3 Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-06 11:48:00 +08:00
• 374a03b83d 管理员 daiyongfei 2025-09-06 11:46:13 +08:00
• b945420446 离线状态变更3 chenyouting 2025-09-05 13:32:32 +08:00
• c057af7cd0 离线状态变更2 chenyouting 2025-09-05 11:46:29 +08:00
• 452c37c4ca 离线状态变更 chenyouting 2025-09-04 18:40:08 +08:00
• d5a9a92f9f feat(device): 新增设备控制相关接口 DragonWenLong 2025-09-04 11:50:18 +08:00
• 429c0f1307 Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-04 11:29:55 +08:00
• ff4db34e2a 型号字典用于APP页面跳转 daiyongfei 2025-09-04 11:29:07 +08:00
• 377579dd14 Merge branch 'dyf-device' into 6170 daiyongfei 2025-09-03 15:57:21 +08:00
• 00e345d5e5 Merge branch 'main' into dyf-device daiyongfei 2025-09-03 15:56:30 +08:00
• 1a2f35a092 Merge pull request 'jingquan' (#9) from liwenlong/fys-Multi-tenant:jingquan into main dyf 2025-09-03 15:55:27 +08:00
• bdbbd5a12f feat(equipment): 添加设备维修图片功能并优化维修记录相关接口- 新增 DeviceRepairImages 相关实体、Mapper 和 XML 文件- 重构 DeviceRepairRecords 相关接口和实现类，支持图片上传 - 新增 RepairImageType 枚举类 - 优化 DeviceRepairRecordsVo，增加图片列表和设备名称字段 DragonWenLong 2025-09-03 15:17:39 +08:00
• 98cb67b136 修改获取经纬度 chenyouting 2025-09-03 15:11:24 +08:00
• d97928b38a 分配客户 接口注释 daiyongfei 2025-09-03 09:45:17 +08:00
• 1d37bfb719 首页数据 daiyongfei 2025-09-02 15:08:53 +08:00
• 98ef841f18 通讯方式 daiyongfei 2025-09-02 10:32:17 +08:00
• 8462fed747 merge upstream liwenlong 2025-09-02 09:06:54 +08:00
• 0787e4b205 Merge remote-tracking branch 'origin/dyf-device' into 6170 daiyongfei 2025-09-02 08:51:41 +08:00
• eca113d388 首页数据 daiyongfei 2025-09-02 08:49:42 +08:00
• 127e26e0d4 首页数据 daiyongfei 2025-09-01 16:03:46 +08:00