磷叶
|
4459deed86
|
优化设备、订单操作，增加IOT操作和日志记录
|
2024-12-25 09:45:12 +08:00 |
|
磷叶
|
6cd799bfdb
|
设备系数
|
2024-12-16 21:36:17 +08:00 |
|
磷叶
|
8530c133bc
|
命令日志
|
2024-12-14 00:59:44 +08:00 |
|
磷叶
|
0a144abd3e
|
监控电量订单结束时间
|
2024-12-09 10:22:48 +08:00 |
|
磷叶
|
66565eda94
|
支付宝登录、获取支付宝手机号、远程配网
|
2024-12-04 11:22:46 +08:00 |
|
磷叶
|
b2c23342d8
|
去除验签
|
2024-11-29 17:29:46 +08:00 |
|
磷叶
|
54351d164a
|
日志修改
|
2024-11-29 14:54:43 +08:00 |
|
磷叶
|
d2e00163bd
|
风控提交
|
2024-11-25 18:01:55 +08:00 |
|
磷叶
|
dab9f0c143
|
debug:数据点获取、归零间隔调整到5秒
|
2024-11-12 10:32:41 +08:00 |
|
磷叶
|
ad7610b9f0
|
debug:数据点获取
|
2024-11-12 09:53:45 +08:00 |
|
磷叶
|
791a919280
|
优化APP设备列表查询速度
|
2024-11-06 17:59:11 +08:00 |
|
磷叶
|
f85e151b3b
|
debug:订单流程优化（待测试）
|
2024-10-25 09:40:40 +08:00 |
|
磷叶
|
f659bacc0e
|
设备版本号
|
2024-10-18 10:06:09 +08:00 |
|
墨大叔
|
4cc8ab112c
|
临时提交
|
2024-10-14 13:29:54 +08:00 |
|
墨大叔
|
a1204272be
|
套餐、订单修改
|
2024-10-11 14:48:27 +08:00 |
|
墨大叔
|
9f7aadd2c3
|
恢复设备总用电量
|
2024-10-07 09:25:18 +08:00 |
|
墨大叔
|
903884cecb
|
设备双MAC在线状态
|
2024-10-06 18:03:03 +08:00 |
|
墨大叔
|
c38bcae036
|
设备余额恢复
|
2024-10-06 13:32:53 +08:00 |
|
墨大叔
|
beb93dad38
|
临时提交：语音版
|
2024-09-30 17:54:21 +08:00 |
|
墨大叔
|
bbb29ccc21
|
更新
|
2024-09-29 18:15:57 +08:00 |
|
墨大叔
|
3960f10abf
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java
|
2024-09-29 10:35:59 +08:00 |
|
墨大叔
|
d0ae71835c
|
debug:双模数据获取
|
2024-09-29 09:38:37 +08:00 |
|
墨大叔
|
cc388750ba
|
debug:双模数据获取
|
2024-09-29 09:22:48 +08:00 |
|
墨大叔
|
16e2ead7e6
|
细节优化
|
2024-09-28 17:14:43 +08:00 |
|
墨大叔
|
3bfb58a5ba
|
订单分成，还差最低收取手续费
|
2024-09-27 17:48:50 +08:00 |
|
墨大叔
|
b8d3f2fc7c
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
# smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java
# smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java
# smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java
# smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
# smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
# smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
# smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
# smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java
|
2024-09-26 09:43:34 +08:00 |
|
墨大叔
|
e2b9f18a21
|
双模设备、用户密码、蓝牙设备充值、支付回调优化
|
2024-09-25 18:30:23 +08:00 |
|
墨大叔
|
ddb0b75468
|
debug:设备充值成功，但订单未支付成功。
查询日志后发现，是由于死锁导致的数据库异常。
|
2024-09-21 16:51:18 +08:00 |
|
墨大叔
|
c9859e4b78
|
套餐低功率关闭
|
2024-09-19 16:10:04 +08:00 |
|
墨大叔
|
ed1df8462c
|
临时提交
|
2024-09-13 15:09:35 +08:00 |
|
墨大叔
|
57720d713c
|
恢复余额（未完成）
|
2024-09-11 17:53:38 +08:00 |
|
墨大叔
|
edd6232433
|
设备上电恢复
|
2024-09-06 17:36:41 +08:00 |
|
墨大叔
|
15b7f77fb5
|
结束订单、设备电量归零
|
2024-09-06 16:16:42 +08:00 |
|
墨大叔
|
7377d39b19
|
debug:发送命令超时会空指针
|
2024-08-22 15:18:40 +08:00 |
|
墨大叔
|
6b1f38f07a
|
套餐修改
|
2024-08-16 22:20:53 +08:00 |
|
墨大叔
|
50741928a5
|
套餐、订单修改
|
2024-08-15 21:23:07 +08:00 |
|
墨大叔
|
6ef84a9fe3
|
设备型号配置产品ID
|
2024-08-12 20:55:59 +08:00 |
|
墨大叔
|
66b948e120
|
API收费及各种优化
|
2024-08-08 17:54:35 +08:00 |
|
墨大叔
|
4d9b5d28ba
|
debug:设备最近更新时间
|
2024-08-05 10:02:14 +08:00 |
|
墨大叔
|
c778ca5abc
|
debug:设备操作提示优化
|
2024-07-22 17:45:59 +08:00 |
|
墨大叔
|
b969fa2a52
|
秘钥缓存、WIFI、设备类名称重构
|
2024-07-19 17:48:58 +08:00 |
|
墨大叔
|
bd428814a3
|
套餐时间修改
|
2024-07-17 13:47:04 +08:00 |
|
墨大叔
|
b48c4dcbc9
|
提交测试环境
|
2024-07-15 15:26:48 +08:00 |
|
墨大叔
|
2296efa998
|
订单套餐时间（暂未测试）
|
2024-07-12 17:54:14 +08:00 |
|
墨大叔
|
1a2128642f
|
debug
|
2024-07-09 11:17:20 +08:00 |
|
墨大叔
|
8ebe489761
|
debug + 绑定操作修改
|
2024-06-14 17:12:03 +08:00 |
|
墨大叔
|
1e22037196
|
设备在线状态推送
|
2024-06-04 15:13:00 +08:00 |
|
墨大叔
|
36d1c75a55
|
debug 蓝牙充值、设备是否在线
|
2024-05-24 16:20:30 +08:00 |
|
墨大叔
|
5162eb39c2
|
debug
|
2024-05-23 09:31:16 +08:00 |
|
墨大叔
|
765a795e36
|
debug
|
2024-05-22 15:50:24 +08:00 |
|