Commit Graph

Select branches

Hide Pull Requests

20251013-版本v1.0

6170-protocol

fys-main

fys-prod

main

main-dyf

Mono Color

• 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
• 7773cae0ea 配置文件提交2 main 20251013-版本v1.0 chenyouting 2025-09-05 10:52:53 +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
• 76e2b9de24 Merge remote-tracking branch 'upstream/dyf-device' into main-dyf main-dyf daiyongfei 2025-09-02 09:30:38 +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
• dfb5d8ac65 修改获取实时状态类型 chenyouting 2025-08-30 13:53:41 +08:00
• 896c501cd6 报警持续时间 daiyongfei 2025-08-30 11:07:04 +08:00
• d8686e3cbd Merge branch 'dyf-device' into 6170 daiyongfei 2025-08-30 09:40:51 +08:00
• c2ce9679c4 设备充放电记录 daiyongfei 2025-08-30 09:39:41 +08:00
• d66fb7d2c2 设备告警 daiyongfei 2025-08-29 18:58:16 +08:00
• 400c53030a Merge remote-tracking branch 'origin/6170' into 6170 chenyouting 2025-08-29 16:49:44 +08:00
• b5565da752 web端控制中心4 chenyouting 2025-08-29 16:49:16 +08:00
• e17a64ad57 查询设备告警列表 daiyongfei 2025-08-29 13:59:23 +08:00
• d97ace42d0 Merge remote-tracking branch 'upstream/dyf-device' into main-dyf daiyongfei 2025-08-29 10:31:18 +08:00
• 3969e50566 查询设备分享列表(web) daiyongfei 2025-08-29 10:29:53 +08:00
• 760738bcdd 设备告警记录 daiyongfei 2025-08-28 13:30:50 +08:00
• 765e0f8509 设备告警 daiyongfei 2025-08-28 11:26:00 +08:00
• 2c565f5c2d 设备告警 daiyongfei 2025-08-28 11:22:04 +08:00
• 7aa02635f2 feat(device): 优化设备人员信息发送逻辑 DragonWenLong 2025-08-27 17:30:00 +08:00
• 626296adbc merge upstream liwenlong 2025-08-27 15:28:40 +08:00
• 9bbed77170 refactor(fys-demo): 优化视频上传接口并修复 MQTT 报警信息发送逻辑 DragonWenLong 2025-08-27 15:27:19 +08:00
• 837953bf3d 设备类型ID daiyongfei 2025-08-27 10:20:37 +08:00
• 8b25fd9ba4 设备操作记录 daiyongfei 2025-08-27 09:25:08 +08:00
• a8c9c631ad Merge remote-tracking branch 'upstream/dyf-device' into main-dyf daiyongfei 2025-08-27 09:12:05 +08:00
• 8a7565459b Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170 daiyongfei 2025-08-27 09:09:20 +08:00
• 0bbac2b497 设备用户详情 daiyongfei 2025-08-27 09:08:27 +08:00
• 364574eeae web端控制中心3 chenyouting 2025-08-27 08:59:29 +08:00
• a5b8cdffec refactor(device): 优化设备发送告警信息功能 DragonWenLong 2025-08-26 17:12:36 +08:00
• f9d9dadf08 绑定设备分组 daiyongfei 2025-08-26 10:00:35 +08:00
• e4df695f5e 绑定设备分组 daiyongfei 2025-08-26 09:26:33 +08:00
• 4663a5560f Merge remote-tracking branch 'upstream/dyf-device' into main-dyf daiyongfei 2025-08-25 14:32:19 +08:00
• f839883f82 feat(device): 新增发送紧急通知功能 DragonWenLong 2025-08-25 14:18:54 +08:00
• 74cefe9cc3 设备详情 daiyongfei 2025-08-25 13:42:24 +08:00
• 9b476e98ba 型号字典用于PC页面跳转 daiyongfei 2025-08-25 11:40:59 +08:00
• d962c6ead5 查询分享用户数 daiyongfei 2025-08-25 10:19:57 +08:00
• 1246ac5cf7 @Schema(title = "ID", hidden = true) daiyongfei 2025-08-23 17:33:35 +08:00
• 7607a0c9c0 Merge remote-tracking branch 'origin/6170' into 6170 chenyouting 2025-08-23 16:40:42 +08:00
• 8811c30a97 web端控制中心2 chenyouting 2025-08-23 16:39:30 +08:00
• d05e046112 Merge branch 'main' into dyf-device daiyongfei 2025-08-22 18:28:40 +08:00
• e86eff48ee Merge pull request 'jingquan' (#8) from liwenlong/fys-Multi-tenant:jingquan into main dyf 2025-08-22 18:26:44 +08:00
• aef16cf6b4 Merge remote-tracking branch 'liwenlong-fys/jingquan' into jingquan DragonWenLong 2025-08-22 18:10:10 +08:00