chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug: 设备充值命令

Browse Source
This commit is contained in:
磷叶 2024-12-17 19:20:22 +08:00
parent bea3dd770f
commit 59d743e7d4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java
View File

@ -73,12 +73,12 @@ public class IotConstants {
public static final String COMMAND_OUTAGE_WAY = "set"; public static final String COMMAND_OUTAGE_WAY = "set";
/** /**
* 命令 累加充值电量 * 命令 累加充值电量，设备不会自行关闭
*/ */
public static final String COMMAND_ADD_ELE = "money"; public static final String COMMAND_ADD_ELE = "money";
/** /**
* 命令 直接设置电量 * 命令 直接设置电量，设备会自行关闭
*/ */
public static final String COMMAND_SET_ELE = "mmney"; public static final String COMMAND_SET_ELE = "mmney";

8
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -518,12 +518,12 @@ public class DeviceServiceImpl implements DeviceService
ServiceUtil.assertion(insertRecord != 1, "记录电量变化失败"); ServiceUtil.assertion(insertRecord != 1, "记录电量变化失败");
if (withIot) { if (withIot) {
// 若设备剩余电量小于0，则补偿电量充值 // 若设备剩余电量大于0，则补偿电量充值
CommandResponse res; CommandResponse res;
if (device.getSurplusEle().compareTo(BigDecimal.ZERO) < 0) { if (device.getSurplusEle().compareTo(BigDecimal.ZERO) > 0) {
res = iotService.addEle(device, amount.subtract(device.getSurplusEle()), reason); res = iotService.setEle(device, amount.add(device.getSurplusEle()), reason);
} else { } else {
res = iotService.addEle(device, amount, reason); res = iotService.setEle(device, amount, reason);
} }
boolean iot = res.isSuccess(); boolean iot = res.isSuccess();
ServiceUtil.assertion(!iot, "为设备充值电量失败"); ServiceUtil.assertion(!iot, "为设备充值电量失败");

2
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -953,7 +953,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
boolean addTime = deviceService.addTime(device, seconds, true, "充值订单：" + bill.getBillNo()); boolean addTime = deviceService.addTime(device, seconds, true, "充值订单：" + bill.getBillNo());
ServiceUtil.assertion(!addTime, "设备时长充值失败"); ServiceUtil.assertion(!addTime, "设备时长充值失败");
} else if (SuitFeeType.COUNT.getType().equals(bill.getSuitFeeType())) { } else if (SuitFeeType.COUNT.getType().equals(bill.getSuitFeeType())) {
// 设备设置电量 // 设备增加电量
BigDecimal ele = transactionBillConverter.toRechargeEle(bill); BigDecimal ele = transactionBillConverter.toRechargeEle(bill);
boolean addEle = deviceService.addEle(device, ele, true, "充值订单：" + bill.getBillNo()); boolean addEle = deviceService.addEle(device, ele, true, "充值订单：" + bill.getBillNo());
ServiceUtil.assertion(!addEle, "设备时长充值失败"); ServiceUtil.assertion(!addEle, "设备时长充值失败");