Commit Graph

Select branches

Hide Pull Requests

fys-main

fys-prod

main

main-dyf

Mono Color

• f67e848256 晶全6710 chenyouting 2025-08-07 15:41:57 +08:00
• 825e9b329c Merge remote-tracking branch 'origin/main' chenyouting 2025-08-06 10:39:01 +08:00
• 67764a733e 设备列表电量显示问题，打印日志优化 chenyouting 2025-08-06 10:38:21 +08:00
• c2eb5ba524 日志配置 daiyongfei 2025-08-06 09:12:47 +08:00
• 57f074995e 发送设备信息代码实现 chenyouting 2025-08-04 15:35:59 +08:00
• 0b0cc84eea Merge branch 'main' into fys-prod daiyongfei 2025-08-04 09:39:08 +08:00
• 0b5514d814 Merge branch 'main' into fys-main fys-main daiyongfei 2025-08-04 09:37:07 +08:00
• ae393e8155 校验设备类型名称 daiyongfei 2025-07-31 10:27:02 +08:00
• 38caba1fad 修改用户状态-强制下线 daiyongfei 2025-08-02 09:18:31 +08:00
• 6626a1a35e 设备行为 daiyongfei 2025-08-04 09:05:10 +08:00
• a4d2f548d3 Merge branch 'main' into fys-main daiyongfei 2025-08-04 09:11:07 +08:00
• 6413888a1c Merge branch 'dyf-device' daiyongfei 2025-08-04 09:07:34 +08:00
• f4d5f950ce 设备行为 daiyongfei 2025-08-04 09:05:10 +08:00
• a74b697c0f 设备历史轨迹2 chenyouting 2025-08-02 14:51:06 +08:00
• 8435a5b0e6 设备行为 daiyongfei 2025-08-02 09:18:31 +08:00
• ce8f6c9a77 设备历史轨迹 chenyouting 2025-08-02 09:09:02 +08:00
• c8dff1a082 位置信息 chenyouting 2025-08-01 17:02:27 +08:00
• 99355e05b8 Merge branch 'main' into dyf-device daiyongfei 2025-08-01 16:27:53 +08:00
• 0ad100a7a5 如果经纬度不变就不去调用地图api chenyouting 2025-08-01 16:27:17 +08:00
• 8770c217ae 设备日志 daiyongfei 2025-08-01 15:19:41 +08:00
• 6fb8e73535 经纬度bug修复 chenyouting 2025-08-01 14:24:03 +08:00
• 51d9d7319a app设备列表查询，新增纬度经度 chenyouting 2025-08-01 11:11:36 +08:00
• 4271085e78 用户注销 chenyouting 2025-08-01 09:58:33 +08:00
• 2cb4f5b83e 设备绑定优化2 chenyouting 2025-08-01 09:07:27 +08:00
• a3a1d43dde Merge remote-tracking branch 'origin/main' chenyouting 2025-08-01 09:06:03 +08:00
• 5f4b12a320 设备绑定优化 chenyouting 2025-08-01 09:00:32 +08:00
• 74be5321ec 代码优化2 chenyouting 2025-07-31 19:03:04 +08:00
• 370783b457 代码优化 chenyouting 2025-07-31 18:09:20 +08:00
• 8ae15dcd9a 修改用户状态-强制下线 daiyongfei 2025-07-31 15:29:37 +08:00
• e07dbb01b7 校验设备类型名称 daiyongfei 2025-07-31 10:27:02 +08:00
• fc3626e1a1 Merge branch 'main' into fys-main daiyongfei 2025-07-31 09:25:09 +08:00
• f2c7549d6e Merge branch 'main' into fys-prod daiyongfei 2025-07-31 09:24:23 +08:00
• 7bd652f9b8 Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-31 09:23:34 +08:00
• 94ac8454ec LngLonUtil daiyongfei 2025-07-31 09:19:06 +08:00
• 0dc896586d Merge branch 'dyf-device' daiyongfei 2025-07-31 09:16:52 +08:00
• 5a23359112 WEB端解绑设备 daiyongfei 2025-07-31 09:08:17 +08:00
• ceeda046ea WEB端解绑设备 daiyongfei 2025-07-30 18:39:12 +08:00
• 6827ff0a3c 设备mqtt收发数据2 chenyouting 2025-07-30 17:14:48 +08:00
• a119ccc8d6 设备mqtt收发数据 chenyouting 2025-07-30 17:13:57 +08:00
• 4fa4e5ec29 Merge branch 'main' into dyf-device daiyongfei 2025-07-30 17:07:29 +08:00
• ac353b1078 设备mqtt收发数据 chenyouting 2025-07-30 08:50:44 +08:00
• abd6d3aa3c 设备日志 daiyongfei 2025-07-29 15:22:09 +08:00
• 3450b025b4 设备报警记录 daiyongfei 2025-07-29 15:21:27 +08:00
• 984081ac98 设备日志 daiyongfei 2025-07-29 11:10:03 +08:00
• 5b3ea9faf5 设备报警记录 daiyongfei 2025-07-29 11:02:09 +08:00
• 2b2edf096d 设备下发指令控制 chenyouting 2025-07-28 18:26:02 +08:00
• 9ffdcace53 LngLonUtil.java daiyongfei 2025-07-28 10:41:09 +08:00
• 8cc969bbe6 Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-28 10:40:31 +08:00
• 6a900335ef LngLonUtil.java daiyongfei 2025-07-28 10:40:13 +08:00
• ef39eb7286 地图坐标转换 daiyongfei 2025-07-26 16:35:45 +08:00
• 730e9c0bb7 地图坐标转换 daiyongfei 2025-07-26 16:33:28 +08:00
• 5657c73867 新增设备:蓝牙名称 必填校验 daiyongfei 2025-07-26 09:17:21 +08:00
• f1806fa482 app用户登录 chenyouting 2025-07-24 14:49:40 +08:00
• 17ed75f54a Merge branch 'main' into fys-prod daiyongfei 2025-07-23 19:26:46 +08:00
• 0abc5d48c0 Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-23 19:26:12 +08:00
• f70c3fa399 Merge branch 'dyf-device' daiyongfei 2025-07-23 19:23:57 +08:00
• d849be68ed 删除设备:分配记录 daiyongfei 2025-07-23 19:22:25 +08:00
• f80debbf2b 登录问题修复 chenyouting 2025-07-23 15:51:25 +08:00
• ad59eea2a9 删除设备:分配记录 daiyongfei 2025-07-23 14:27:08 +08:00
• e7c8e245ba Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-23 11:01:01 +08:00
• 80b944cbf0 Merge remote-tracking branch 'upstream/main' into fys-prod daiyongfei 2025-07-23 10:57:03 +08:00
• da6b888934 Merge branch 'dyf-device' daiyongfei 2025-07-23 10:54:20 +08:00
• 619356209b 删除设备 daiyongfei 2025-07-23 10:53:26 +08:00
• d84a7cde3b 帐号状态（0正常 1停用）status daiyongfei 2025-07-23 09:52:28 +08:00
• e4dbee15dd 设备分享功能开发 chenyouting 2025-07-22 18:37:02 +08:00
• 33e53de5a1 设备主题 daiyongfei 2025-07-22 16:13:39 +08:00
• 3bce279d7b 修改客户-用户名重复校验 daiyongfei 2025-07-22 09:58:49 +08:00
• 9338b0d24b 设备详情功能开发 chenyouting 2025-07-21 15:24:26 +08:00
• 537cc0b2d7 Merge branch 'main' into fys-prod daiyongfei 2025-07-21 08:45:53 +08:00
• 8750bc8e10 Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-21 08:43:34 +08:00
• 6dde6c3a3b 去掉demo daiyongfei 2025-07-21 08:42:21 +08:00
• 879e485056 Merge branch 'dyf-device' daiyongfei 2025-07-21 08:39:55 +08:00
• bb096f53cd 去除demo模块 chenyouting 2025-07-19 16:16:22 +08:00
• 38724dbfad Merge branch 'main' into fys-prod daiyongfei 2025-07-19 15:58:51 +08:00
• 69c4cc2004 APP设备分享功能开发2 chenyouting 2025-07-19 14:28:07 +08:00
• e9227dea89 Merge remote-tracking branch 'origin/main' chenyouting 2025-07-19 14:24:21 +08:00
• b369b28949 新增忘记密码手机短信验证码 chenyouting 2025-07-19 14:23:29 +08:00
• a7340c744e APP客户设备绑定-绑定时间 daiyongfei 2025-07-19 14:22:36 +08:00
• f1d1528c40 Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-19 10:26:52 +08:00
• 6bbe9cbdd1 Merge branch 'dyf-device' daiyongfei 2025-07-19 10:21:11 +08:00
• 3feafc2cd9 删除设备类型 daiyongfei 2025-07-19 10:20:07 +08:00
• 13986bb493 APP设备分享功能开发 chenyouting 2025-07-19 09:36:35 +08:00
• f2921ff12f 分页查询设备-设备类型 daiyongfei 2025-07-19 09:17:14 +08:00
• ec89dd8c1e 新增设备 校验 daiyongfei 2025-07-18 18:12:36 +08:00
• 57322c9c87 蓝牙名称 daiyongfei 2025-07-18 17:57:58 +08:00
• 73e1df4232 Merge branch 'main' into fys-prod daiyongfei 2025-07-18 16:30:02 +08:00
• 4e608b8f3a merge upstream fys 2025-07-18 16:24:05 +08:00
• 7d91426414 Merge branch 'dyf-device' daiyongfei 2025-07-18 15:17:18 +08:00
• ad06811747 撤回设备 daiyongfei 2025-07-18 15:06:39 +08:00
• aeaa906bc9 Merge pull request 'feat(fys-demo): 添加视频上传和处理功能' (#5) from liwenlong/fys-Multi-tenant:jingquan into main dyf 2025-07-18 14:03:18 +08:00
• 36092932bf feat(fys-demo): 添加视频上传和处理功能 DragonWenLong 2025-07-18 13:27:26 +08:00
• 34188f20dd 帐号状态（0正常 1停用） daiyongfei 2025-07-18 11:18:30 +08:00
• 0fa0e4ab1b 帐号状态（0正常 1停用） daiyongfei 2025-07-18 10:36:02 +08:00
• e321dcd652 修改客户状态 daiyongfei 2025-07-18 10:23:04 +08:00
• e35955f156 prod daiyongfei 2025-07-17 17:27:14 +08:00
• 3c2d97aaf2 提交 chenyouting 2025-07-17 17:17:30 +08:00
• 6ed1241a6d Merge remote-tracking branch 'upstream/main' daiyongfei 2025-07-17 17:03:25 +08:00
• 78e2538f71 Merge branch 'dyf-device' daiyongfei 2025-07-17 16:41:08 +08:00
• faef79e56d return R.ok(); daiyongfei 2025-07-17 16:29:25 +08:00
• 7b1615ce4d WEB端解绑设备 daiyongfei 2025-07-17 16:20:22 +08:00