Commit Graph

Select branches

Hide Pull Requests

20251013-版本v1.0

6170-protocol

fys-main

fys-prod

main

main-dyf

Mono Color

• 95aa01e1c2 feat(device): 新增星汉设备控制功能 DragonWenLong 2025-08-22 18:09:08 +08:00
• 816b3aa5ee Merge remote-tracking branch 'upstream/dyf-device' daiyongfei 2025-08-22 16:41:23 +08:00
• 2965b454cf web:设备分组 接口文档 daiyongfei 2025-08-22 16:37:58 +08:00
• b83be496b6 出厂日期 daiyongfei 2025-08-22 09:58:27 +08:00
• 4965d78c51 设备所属分组 daiyongfei 2025-08-22 09:40:52 +08:00
• 9dee7ad102 管理员 daiyongfei 2025-08-21 17:55:59 +08:00
• e9542c70e9 Merge pull request 'jingquan' (#7) from liwenlong/fys-Multi-tenant:jingquan into dyf-device dyf 2025-08-21 17:54:48 +08:00
• 51297f269d Merge branch 'dyf-device' into jingquan dyf 2025-08-21 17:54:39 +08:00
• 4077fd303f merge upstream liwenlong 2025-08-21 17:44:57 +08:00
• f1a19f95f5 feat(mqtt): 新增星汉设备数据处理规则和解析逻辑- 添加 MqttXinghanCommandType 枚举类，用于识别和处理星汉设备的命令类型 - 新增 MqttXinghanJson 类，用于解析星汉设备的 JSON 数据 - 在 ReceiverMessageHandler 中集成星汉设备数据的处理逻辑 - 添加 XingHanCommandTypeConstants 常量类，定义星汉设备的命令类型常量 - 实现 XinghanDeviceDataRule 类，处理星汉设备主动上报的数据命令 DragonWenLong 2025-08-21 17:44:06 +08:00
• e6d0e883fb 管理员 daiyongfei 2025-08-21 16:51:17 +08:00
• 5b6927729f WebApp用户信息 daiyongfei 2025-08-21 15:17:11 +08:00
• 8c883688bd Merge remote-tracking branch 'origin/fys-prod' daiyongfei 2025-08-21 15:12:00 +08:00
• c34a39a308 WebApp用户信息 fys-prod daiyongfei 2025-08-21 15:11:22 +08:00
• 7b842f5cc7 查询APP用户信息列表 daiyongfei 2025-08-21 11:48:36 +08:00
• b08d23eef4 Merge branch 'main' into fys-prod daiyongfei 2025-08-21 09:59:23 +08:00
• add0738b28 Merge remote-tracking branch 'origin/main' chenyouting 2025-08-21 09:55:26 +08:00
• b61c9c7a06 配置文件提交 chenyouting 2025-08-21 09:54:42 +08:00
• 8106d09e67 生产配置 daiyongfei 2025-08-20 16:53:27 +08:00
• 425ea306e3 Merge branch 'main' into fys-prod daiyongfei 2025-08-20 16:48:48 +08:00
• fd7768acc9 Merge remote-tracking branch 'upstream/6170' daiyongfei 2025-08-20 16:45:49 +08:00
• bb11bc4dfa WEB端解绑设备 daiyongfei 2025-08-20 15:13:43 +08:00
• 7f65ebedc2 数据字典信息 daiyongfei 2025-08-20 13:31:54 +08:00
• 75756eb8ab Merge remote-tracking branch 'upstream/6170' chenyouting 2025-08-19 14:11:02 +08:00
• 34ee4cceca web端控制中心 chenyouting 2025-08-19 13:58:48 +08:00
• 9a6bf05c4b 根据mac地址查询设备详情 chenyouting 2025-08-18 11:04:23 +08:00
• b51e88052f 设备分享3 chenyouting 2025-08-16 16:40:58 +08:00
• 6d9e75d4fa Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170 daiyongfei 2025-08-16 14:19:19 +08:00
• 58814fe312 Merge branch 'main' into 6170 daiyongfei 2025-08-16 14:18:49 +08:00
• 6d6db190b9 设备分享2 chenyouting 2025-08-16 11:30:06 +08:00
• f8c53451c0 修改灯光上报状态 chenyouting 2025-08-15 18:16:37 +08:00
• 285abaedfb Merge branch 'main' into fys-prod daiyongfei 2025-08-15 14:37:23 +08:00
• adc3834ddc Merge branch 'main' into 6170 chenyouting 2025-08-15 10:15:56 +08:00
• 33f3cb5989 app增加字典 chenyouting 2025-08-15 10:14:35 +08:00
• f65a8cdc8c 型号字典 modelDictionary daiyongfei 2025-08-15 09:40:33 +08:00
• a21062b296 Merge branch 'main' into 6170 chenyouting 2025-08-15 09:34:17 +08:00
• 77542f5e76 commit chenyouting 2025-08-15 09:32:54 +08:00
• c587ef7389 解绑优化 chenyouting 2025-08-14 18:57:50 +08:00
• 48e972166f 型号字典 daiyongfei 2025-08-14 18:55:53 +08:00
• f1a3a0325b 添加告警处理逻辑6 chenyouting 2025-08-14 18:28:55 +08:00
• 9e24e3daaf 添加告警处理逻辑4 chenyouting 2025-08-14 17:38:07 +08:00
• 51741adc69 添加告警处理逻辑3 chenyouting 2025-08-14 16:25:14 +08:00
• 3145b494d9 添加告警处理逻辑2 chenyouting 2025-08-14 15:56:10 +08:00
• a189d0d0f9 添加告警处理逻辑 chenyouting 2025-08-14 15:07:58 +08:00
• 447aa73ae9 Merge branch 'dyf-device' daiyongfei 2025-08-14 14:22:43 +08:00
• 9c9d18cddc 查询设备分组列表 daiyongfei 2025-08-14 14:21:47 +08:00
• 8a6c196fb9 访问控制 chenyouting 2025-08-14 11:51:27 +08:00
• 1af4b165f2 新增设备分组 daiyongfei 2025-08-13 19:29:04 +08:00
• 07bc831f1a 登录测试 daiyongfei 2025-08-13 19:21:57 +08:00
• a8efbb2768 全局控制 chenyouting 2025-08-13 10:40:10 +08:00
• 546433b3bc 提交2 chenyouting 2025-08-12 18:10:41 +08:00
• 61ed9f0154 提交 chenyouting 2025-08-12 17:03:11 +08:00
• bc165f5d60 分享管理 chenyouting 2025-08-09 17:09:26 +08:00
• af64984623 修改分享功能 chenyouting 2025-08-09 08:49:37 +08:00
• 0c932c686d 修改分享查看 chenyouting 2025-08-08 16:32:40 +08:00
• 47dbd33d56 修改在线上报状态 chenyouting 2025-08-08 15:09:59 +08:00
• 72cab138a7 设备控制中心 daiyongfei 2025-08-08 10:44:49 +08:00
• 3abee42b07 设备控制中心 daiyongfei 2025-08-08 10:43:53 +08:00
• 9fb72e5ac0 设备分组 daiyongfei 2025-08-08 09:49:08 +08:00
• 65caea4a00 解决冲突 chenyouting 2025-08-07 18:17:49 +08:00
• 83458d0060 Merge remote-tracking branch 'upstream/main' daiyongfei 2025-08-07 18:10:47 +08:00
• 41c6cb935d Merge branch 'dyf-device' daiyongfei 2025-08-07 18:08:12 +08:00
• 9de55857bc 晶全日志配置 daiyongfei 2025-08-07 18:07:04 +08:00
• efed6f3683 修改包名 chenyouting 2025-08-07 15:56:12 +08:00
• 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