From e2b9f18a2154be7f160779d699c2e038c2f45aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Wed, 25 Sep 2024 18:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E6=A8=A1=E8=AE=BE=E5=A4=87=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E3=80=81=E8=93=9D=E7=89=99?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=85=85=E5=80=BC=E3=80=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/enums/UserType.java | 4 +- .../com/ruoyi/common/utils/StringUtils.java | 11 ++ .../ruoyi/common/utils/http/HttpUtils.java | 4 +- .../ruoyi/iot/domain/CurrentDeviceData.java | 11 +- .../com/ruoyi/iot/domain/IotDeviceInfo.java | 2 +- .../com/ruoyi/iot/interfaces/IotDevice.java | 18 ++ .../iot/service/IotReceiveServiceImpl.java | 2 +- .../com/ruoyi/iot/service/IotService.java | 86 +++------ .../com/ruoyi/iot/service/IotServiceImpl.java | 170 ++++++++++++++---- .../com/ruoyi/ss/device/domain/Device.java | 20 ++- .../ruoyi/ss/device/domain/DeviceQuery.java | 6 + .../ss/device/domain/vo/DeviceMacSnVO.java | 1 + .../ruoyi/ss/device/domain/vo/DeviceVO.java | 12 +- .../ruoyi/ss/device/mapper/DeviceMapper.java | 2 +- .../ruoyi/ss/device/mapper/DeviceMapper.xml | 36 +++- .../ss/device/service/DeviceService.java | 27 ++- .../service/impl/DeviceServiceImpl.java | 116 ++++++++---- .../service/impl/DeviceValidatorImpl.java | 14 +- .../SmMeterReadingRecordServiceImpl.java | 2 +- .../ruoyi/ss/model/domain/SmModelQuery.java | 5 + .../ruoyi/ss/model/domain/enums/ModelTag.java | 16 ++ .../ruoyi/ss/model/mapper/SmModelMapper.xml | 6 + .../service/impl/PayBillServiceImpl.java | 47 ++--- .../service/impl/TimeBillServiceImpl.java | 4 +- .../domain/TransactionBill.java | 5 + .../domain/vo/TransactionBillVO.java | 17 +- .../mapper/TransactionBillMapper.xml | 9 +- .../service/impl/RechargeDepositAfterPay.java | 2 +- .../impl/TransactionBillServiceImpl.java | 53 +++--- .../domain/dto/UserUpdatePasswordDTO.java | 24 +++ .../user/service/impl/SmUserServiceImpl.java | 6 + .../com/ruoyi/task/bill/BillLowPowerTask.java | 4 +- .../controller/app/AppDeviceController.java | 35 +++- .../app/AppTransactionBillController.java | 10 ++ .../web/controller/app/AppUserController.java | 38 +++- .../web/controller/ss/SmUserController.java | 2 + 36 files changed, 612 insertions(+), 215 deletions(-) create mode 100644 smart-switch-service/src/main/java/com/ruoyi/iot/interfaces/IotDevice.java create mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/dto/UserUpdatePasswordDTO.java diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java index 3db456f2..8bc83a73 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java @@ -15,8 +15,8 @@ import java.util.Objects; @AllArgsConstructor public enum UserType { - TENANT("00", "租户"), - LANDLORD("01", "商户"); + NORMAL("00", "普通用户"), + MCH("01", "商户"); private final String type; private final String name; diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java index 9acce5ec..c228603d 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -691,4 +691,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils } return new String(chars); } + + /** + * 替换最后一个 + * @param str + * @param pattern + * @param replace + * @return + */ + public static String replaceLast(String str, String pattern, String replace) { + return reverse(reverse(str).replaceFirst(reverse(pattern), reverse(replace))); + } } diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java index 3194ca84..3f08c80d 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -72,7 +72,7 @@ public class HttpUtils try { String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url; - log.info("sendGet - {}", urlNameString); +// log.info("sendGet - {}", urlNameString); URL realUrl = new URL(urlNameString); URLConnection connection = realUrl.openConnection(); connection.setRequestProperty("accept", "*/*"); @@ -382,7 +382,7 @@ public class HttpUtils try { String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url; - log.info("sendGet - {}", urlNameString); +// log.info("sendGet - {}", urlNameString); URL realUrl = new URL(urlNameString); URLConnection connection = realUrl.openConnection(); connection.setRequestProperty("accept", "*/*"); diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java index 74ec48c5..fcc66cfd 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java @@ -2,10 +2,10 @@ package com.ruoyi.iot.domain; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.utils.NumberUtils; +import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.iot.constants.ReceiveConstants; import com.ruoyi.ss.device.domain.enums.DeviceOutageWay; import lombok.Data; -import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; @@ -27,12 +27,13 @@ public class CurrentDeviceData { * @return */ public IotDeviceInfo parseDeviceInfo() { + if (CollectionUtils.isEmptyElement(datastreams)) { + return null; + } + IotDeviceInfo device = IotDeviceInfo.newDefaultInstance(); device.setMac(title); device.setId(id); - if (CollectionUtils.isEmpty(datastreams)) { - return device; - } for (CurrentDatastream stream : datastreams) { String value = stream.getValue().toString(); @@ -51,7 +52,7 @@ public class CurrentDeviceData { device.setW(NumberUtils.nonNullDecimal(value).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP)); break; case ReceiveConstants.DS_S: - device.setS(value); + device.setS(Integer.valueOf(value).toString()); break; case ReceiveConstants.DS_M: device.setM(NumberUtils.nonNullDecimal(value).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP)); diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java index 5397156d..3bff42bf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java @@ -29,7 +29,7 @@ public class IotDeviceInfo { private BigDecimal w; // 总用电量（度） private String s; // 开关状态，0不通电，1闭合通电 private BigDecimal m; // 剩余电量（度） - private String set; // 欠费断电方式 + private String set; // 开关设置状态 private BigDecimal time; // 剩余时间（秒） private String model; // 型号 private String wifi; // WIFI diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/interfaces/IotDevice.java b/smart-switch-service/src/main/java/com/ruoyi/iot/interfaces/IotDevice.java new file mode 100644 index 00000000..39ff6580 --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/interfaces/IotDevice.java @@ -0,0 +1,18 @@ +package com.ruoyi.iot.interfaces; + +/** + * @author wjh + * 2024/9/25 + */ +public interface IotDevice { + + // 获取MAC-1 + String getMac1(); + + // 获取MAC-2 + String getMac2(); + + // 获取OneNet产品ID + String getProductId(); + +} diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java index 8610e5d5..f58336e2 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java @@ -97,7 +97,7 @@ public class IotReceiveServiceImpl implements IotReceiveService{ } if (seconds > 0) { - iotService.setTime(device.getMac(), seconds, device.getModelProductId()); + iotService.setTime(device, seconds); } if (ele.compareTo(BigDecimal.ZERO) > 0) { iotService.setEle(device.getMac(), ele, device.getModelProductId()); diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java index 7f21b83a..2e1ea301 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java @@ -6,7 +6,7 @@ import com.ruoyi.iot.domain.HistoryDeviceData; import com.ruoyi.iot.domain.IotDeviceDetail; import com.ruoyi.iot.domain.IotDeviceInfo; import com.ruoyi.iot.domain.response.CommandResponse; -import com.ruoyi.ss.device.domain.Device; +import com.ruoyi.iot.interfaces.IotDevice; import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; import java.math.BigDecimal; @@ -17,28 +17,6 @@ import java.util.List; * 2024/3/20 */ public interface IotService { - /** - * 向设备发送命令 - * - * @param deviceName OneNet设备名称（即设备表的MAC号） - * @param command 命令字符串 - * @param productId - * @return - */ - default CommandResponse sendCommand(String deviceName, String command, String productId) { - return sendCommand(deviceName, command, null, productId); - } - - /** - * 向设备发送命令 - * - * @param deviceName OneNet设备名称（即设备表的MAC号） - * @param command 命令字符串 - * @param timeout - * @param productId - * @return - */ - CommandResponse sendCommand(String deviceName, String command, Integer timeout, String productId); /** * 获取设备在线状态 @@ -48,6 +26,11 @@ public interface IotService { */ DeviceOnlineStatus getOnlineStatus(String deviceName, String productId); + /** + * 获取设备在线状态 + */ + DeviceOnlineStatus getOnlineStatus(IotDevice device); + /** * 通电 * @@ -57,6 +40,10 @@ public interface IotService { */ boolean open(String deviceName, String productId); + /** + * 通电 + */ + boolean open(IotDevice device); /** * 断电 @@ -68,36 +55,9 @@ public interface IotService { boolean close(String deviceName, String productId); /** - * 获取历史设备数据点信息 - * - * @param deviceName OneNet设备名称（即设备表的MAC号） - * @param productId + * 断电 */ - HistoryDeviceData getHistoryDataPoint(String deviceName, String productId); - - /** - * 批量获取当前设备数据点信息 - * - * @param deviceNames 设备名称列表 - * @param productId - */ - List getCurrentDataPoint(List deviceNames, String productId); - - /** - * 获取当前设备数据点信息 - * - * @param deviceName 设备名称 - * @param productId - */ - CurrentDeviceData getCurrentDataPoint(String deviceName, String productId); - - /** - * 获取设备详情 - * - * @param deviceName 设备名称 - * @param productId - */ - IotDeviceDetail getDeviceDetail(String deviceName, String productId); + boolean close(IotDevice device); /** * 设置剩余时长 @@ -109,12 +69,9 @@ public interface IotService { CommandResponse setTime(String deviceName, long seconds, String productId); /** - * 更新设备信息 - * - * @param device 设备信息 - * @param productId + * 设置剩余时长 */ - boolean updateDevice(Device device, String productId); + CommandResponse setTime(IotDevice device, long seconds); /** * 获取设备信息，并转化为IotDeviceInfo @@ -124,6 +81,11 @@ public interface IotService { */ IotDeviceInfo getDeviceInfo(String deviceName, String productId); + /** + * 获取设备信息，并转为IotDeviceInfo + */ + IotDeviceInfo getDeviceInfo(IotDevice device); + /** * 获取设备信息列表，并转换为IotDeviceInfo * @@ -142,8 +104,18 @@ public interface IotService { */ CommandResponse addEle(String deviceName, BigDecimal ele, String productId); + /** + * 设备添加电量（度） + */ + CommandResponse addEle(IotDevice device, BigDecimal ele); + /** * 直接设置设备电量（度） */ CommandResponse setEle(String deviceName, BigDecimal ele, String productId); + + /** + * 直接设置设备电量（度） + */ + CommandResponse setEle(IotDevice device, BigDecimal ele); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java index 4aa708d0..c0ea0082 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java @@ -15,14 +15,11 @@ import com.ruoyi.iot.domain.response.CurrentDataPointResponse; import com.ruoyi.iot.domain.response.DetailResponse; import com.ruoyi.iot.domain.response.HistoryDataPointResponse; import com.ruoyi.iot.enums.IotHttpStatus; -import com.ruoyi.iot.util.CommandBuilder; -import com.ruoyi.ss.device.domain.Device; +import com.ruoyi.iot.interfaces.IotDevice; import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; -import com.ruoyi.ss.device.domain.enums.DeviceOutageWay; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; @@ -76,9 +73,29 @@ public class IotServiceImpl implements IotService { return IotDeviceDetail.Status.toDeviceOnlineStatus(detail.getStatus()); } + @Override + public DeviceOnlineStatus getOnlineStatus(IotDevice device) { + DeviceOnlineStatus status = DeviceOnlineStatus.OFFLINE; + if (device == null || StringUtils.isBlank(device.getProductId())) { + return status; + } + // 优先使用mac1判断 + if (StringUtils.hasText(device.getMac1())) { + status = this.getOnlineStatus(device.getMac1(), device.getProductId()); + } + // 若还是离线，则判断mac2是否在线 + if (status == DeviceOnlineStatus.OFFLINE && StringUtils.hasText(device.getMac2())) { + status = this.getOnlineStatus(device.getMac2(), device.getProductId()); + } + return status; + } + // 通电 @Override public boolean open(String deviceName, String productId) { + if (StringUtils.hasBlank(deviceName, productId)) { + return false; + } CommandResponse response = sendCommand(deviceName, IotConstants.COMMAND_OPEN, productId); IotHttpStatus status = IotHttpStatus.convertByCode(response.getCode()); if (!IotHttpStatus.SUCCESS.equals(status)) { @@ -87,6 +104,27 @@ public class IotServiceImpl implements IotService { return true; } + @Override + public boolean open(IotDevice device) { + boolean result = false; + if (device == null || StringUtils.isBlank(device.getProductId())) { + return result; + } + + // 尝试用mac1通电 + try { + result = this.open(device.getMac1(), device.getProductId()); + if (!result) { + throw new ServiceException("mac1通电失败"); + } + } catch (Exception e) { + log.info("mac1通电失败，尝试用mac2通电"); + result = this.open(device.getMac2(), device.getProductId()); + } + + return result; + } + // 断电 @Override public boolean close(String deviceName, String productId) { @@ -98,9 +136,29 @@ public class IotServiceImpl implements IotService { return true; } - // 获取历史设备数据点信息 @Override - public HistoryDeviceData getHistoryDataPoint(String deviceName, String productId) { + public boolean close(IotDevice device) { + boolean result = false; + if (device == null || StringUtils.isBlank(device.getProductId())) { + return result; + } + + // 尝试用mac1断电 + try { + result = this.close(device.getMac1(), device.getProductId()); + if (!result) { + throw new ServiceException("mac1断电失败"); + } + } catch (Exception e) { + log.info("mac1断电失败，尝试用mac2断电"); + result = this.close(device.getMac2(), device.getProductId()); + } + + return result; + } + + // 获取历史设备数据点信息 + private HistoryDeviceData getHistoryDataPoint(String deviceName, String productId) { String param = "device_name=" + deviceName + "&product_id=" + productId; String sendUrl = iotHost + IotConstants.ADDS_HISTORY_DATAPOINTS + "?"+param; @@ -122,7 +180,6 @@ public class IotServiceImpl implements IotService { } // 获取当前设备数据点信息 - @Override public List getCurrentDataPoint(List deviceNames, String productId) { String param = "device_name=" + String.join(",", deviceNames) + "&product_id=" + productId; String sendUrl = iotHost+ IotConstants.ADDS_CURRENT_DATAPOINTS + "?" + param; @@ -144,8 +201,7 @@ public class IotServiceImpl implements IotService { } // 获取当前设备数据点信息 - @Override - public CurrentDeviceData getCurrentDataPoint(String deviceName, String productId) { + private CurrentDeviceData getCurrentDataPoint(String deviceName, String productId) { List list = this.getCurrentDataPoint(Collections.singletonList(deviceName), productId); if (CollectionUtils.isEmpty(list)) { return null; @@ -153,8 +209,7 @@ public class IotServiceImpl implements IotService { return list.stream().filter(item -> Objects.equals(item.getTitle(), deviceName)).findFirst().orElse(null); } - @Override - public IotDeviceDetail getDeviceDetail(String deviceName, String productId) { + private IotDeviceDetail getDeviceDetail(String deviceName, String productId) { String sendUrl = iotHost + IotConstants.ADDS_DEVICE_DETAIL; String param = "device_name=" + deviceName + "&product_id=" + productId; @@ -191,6 +246,23 @@ public class IotServiceImpl implements IotService { return sendCommand(deviceName, IotConstants.COMMAND_RECHARGE + seconds + IotConstants.COMMAND_SEPARATOR, 5, productId); } + @Override + public CommandResponse setTime(IotDevice device, long seconds) { + if (device == null || StringUtils.isBlank(device.getProductId())) { + throw new ServiceException("设置时长错误：参数不允许为空"); + } + + CommandResponse res = null; + if (StringUtils.hasText(device.getMac1())) { + res = this.setTime(device.getMac1(), seconds, device.getProductId()); + } + if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) { + res = this.setTime(device.getMac2(), seconds, device.getProductId()); + } + + return res; + } + @Override public CommandResponse addEle(String deviceName, BigDecimal ele, String productId) { @@ -200,32 +272,46 @@ public class IotServiceImpl implements IotService { return sendCommand(deviceName, IotConstants.COMMAND_ADD_ELE + ele.multiply(BigDecimal.valueOf(1000)) + IotConstants.COMMAND_SEPARATOR, 5, productId); } + @Override + public CommandResponse addEle(IotDevice device, BigDecimal ele) { + if (device == null || StringUtils.isBlank(device.getProductId())) { + throw new ServiceException("充值电量错误：参数不允许为空"); + } + + CommandResponse res = null; + if (StringUtils.hasText(device.getMac1())) { + res = this.addEle(device.getMac1(), ele, device.getProductId()); + } + if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) { + res = this.addEle(device.getMac2(), ele, device.getProductId()); + } + + return res; + } + @Override public CommandResponse setEle(String deviceName, BigDecimal ele, String productId) { if (ele == null) { - throw new ServiceException("设置电量错误：不允许为空"); + throw new ServiceException("设置电量错误：电量不允许为空"); } return sendCommand(deviceName, IotConstants.COMMAND_SET_ELE + ele.multiply(BigDecimal.valueOf(1000)) + IotConstants.COMMAND_SEPARATOR, 5, productId); } - /** - * 更新设备信息 - * - * @param device 设备信息 - * @param productId - */ @Override - @Transactional - public boolean updateDevice(Device device, String productId) { - DeviceOutageWay deviceOutageWay = DeviceOutageWay.parse(device.getOutageWay()); + public CommandResponse setEle(IotDevice device, BigDecimal ele) { + if (device == null || StringUtils.isBlank(device.getProductId())) { + throw new ServiceException("设置电量错误：参数不允许为空"); + } - String command = CommandBuilder.builder() - // 断电方式，若为空，则立即断电 - .setIfNull(IotConstants.COMMAND_OUTAGE_WAY, deviceOutageWay.getValue() , DeviceOutageWay.IMMEDIATE.getValue()) - .build(); - CommandResponse response = sendCommand(device.getMac(), command, productId); - ServiceUtil.assertion(!Objects.equals(IotHttpStatus.SUCCESS.getCode(), response.getCode()), "修改设备设置发生异常：" + response.getMsg()); - return true; + CommandResponse res = null; + if (StringUtils.hasText(device.getMac1())) { + res = this.setEle(device.getMac1(), ele, device.getProductId()); + } + if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) { + res = this.setEle(device.getMac2(), ele, device.getProductId()); + } + + return res; } @Override @@ -240,6 +326,23 @@ public class IotServiceImpl implements IotService { return currentDataPoint.parseDeviceInfo(); } + @Override + public IotDeviceInfo getDeviceInfo(IotDevice device) { + IotDeviceInfo info = null; + if (device == null || StringUtils.isBlank(device.getProductId())) { + return info; + } + + if (StringUtils.hasText(device.getMac1())) { + info = getDeviceInfo(device.getMac1(), device.getProductId()); + } + if (info == null && StringUtils.hasText(device.getMac2())) { + info = getDeviceInfo(device.getMac2(), device.getProductId()); + } + + return info; + } + @Override public List getDeviceInfo(List deviceNames, String productId) { if (CollectionUtils.isEmpty(deviceNames)) { @@ -249,7 +352,10 @@ public class IotServiceImpl implements IotService { if (CollectionUtils.isEmpty(dataList)) { return Collections.emptyList(); } - return dataList.stream().map(CurrentDeviceData::parseDeviceInfo).collect(Collectors.toList()); + return dataList.stream() + .map(CurrentDeviceData::parseDeviceInfo) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } @Override @@ -267,10 +373,12 @@ public class IotServiceImpl implements IotService { return paramsObj.getInteger("code"); } + private CommandResponse sendCommand(String deviceName, String command, String productId) { + return sendCommand(deviceName, command, null, productId); + } // 发送MQTT命令 - @Override - public CommandResponse sendCommand(String deviceName, String command, Integer timeout, String productId) { + private CommandResponse sendCommand(String deviceName, String command, Integer timeout, String productId) { if (timeout == null) { timeout = this.timeout; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java index 5578ebb8..5acc14f9 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java @@ -64,6 +64,11 @@ public class Device extends BaseEntity @JsonView(JsonViewProfile.App.class) private String mac; + @Excel(name = "设备Mac号2") + @ApiModelProperty("设备Mac号2") + @JsonView(JsonViewProfile.App.class) + private String mac2; + /** 激活时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("激活时间") @@ -113,14 +118,8 @@ public class Device extends BaseEntity @ApiModelProperty("用户昵称") private String nickName; - @Excel(name = "欠费断电") - @ApiModelProperty("断电方式：0欠费不断电，1欠费立即断电") -// @EnumValid( -// clazz = DeviceOutageWay.class, -// message = "非法的超时断电方式", -// method = "getValue", -// groups = {ValidGroup.Create.class, ValidGroup.Update.class, ValidGroup.FrontUpdate.class} -// ) + @Excel(name = "开关设置方式") + @ApiModelProperty("开关设置方式") private String outageWay; @Excel(name = "wifi名称") @@ -205,4 +204,9 @@ public class Device extends BaseEntity @ApiModelProperty("限制充值原因") @Size(max = 200, message = "限制充值原因长度不能超过200个字符") private String limitRechargeReason; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后在线时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最后在线时间") + private LocalDateTime lastOnlineTime; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java index 7bfcc186..1919c94e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java @@ -73,4 +73,10 @@ public class DeviceQuery extends Device { @ApiModelProperty("MAC列表") private List macList; + + @ApiModelProperty("任意MAC") + private String anyMac; + + @ApiModelProperty("模糊查询任意MAC") + private String likeAnyMac; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceMacSnVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceMacSnVO.java index 19da4dfe..e63fbd78 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceMacSnVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceMacSnVO.java @@ -10,6 +10,7 @@ import lombok.Data; public class DeviceMacSnVO { private String mac; + private String mac2; private String sn; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java index ccc6d03f..63dd811f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java @@ -3,6 +3,7 @@ package com.ruoyi.ss.device.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonView; import com.ruoyi.common.core.domain.JsonViewProfile; +import com.ruoyi.iot.interfaces.IotDevice; import com.ruoyi.ss.device.domain.DeviceView; import com.ruoyi.ss.device.domain.Device; import com.ruoyi.ss.suit.domain.SuitVO; @@ -18,7 +19,7 @@ import java.util.List; * 2024/3/15 */ @Data -public class DeviceVO extends Device { +public class DeviceVO extends Device implements IotDevice { @ApiModelProperty("是否默认") private Boolean isDefault; // 是否默认 @@ -74,4 +75,13 @@ public class DeviceVO extends Device { @ApiModelProperty("型号产品ID") private String modelProductId; + @Override + public String getMac1() { + return getMac(); + } + + @Override + public String getProductId() { + return getModelProductId(); + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java index 0ede4098..6834a5a5 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java @@ -98,7 +98,7 @@ public interface DeviceMapper * @param deviceId 设备id * @param storeId 店铺id */ - int bindStore(@Param("deviceId") Long deviceId, @Param("storeId") Long storeId, @Param("userId") Long userId); + int bind(@Param("deviceId") Long deviceId, @Param("storeId") Long storeId, @Param("userId") Long userId); /** * 解绑商户 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml index 89e9a8bc..6ce43dfc 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml @@ -15,7 +15,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sd.service_type = #{serviceType} and sd.device_name like concat('%', #{deviceName}, '%') and sm.model_name like concat('%', #{model}, '%') - and sd.mac like concat('%', #{mac}, '%') + and sd.mac = #{mac} + and sd.mac2 = #{mac2} + + and ( + sd.mac = #{anyMac} or sd.mac2 = #{anyMac} + ) + + + and ( + sd.mac like concat('%', #{likeAnyMac}, '%') or sd.mac2 like concat('%', #{likeAnyMac}, '%') + ) + and sd.online_status = #{onlineStatus} and sd.status = #{status} and su.user_name like concat('%', #{userName}, '%') @@ -68,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and sd.moidel_id in + and sd.model_id in #{item} @@ -91,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.device_name, sd.model_id, sd.mac, + sd.mac2, sd.activation_time, sd.total_electri_quantity, sd.online_status, @@ -127,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.surplus_ele, sd.limit_recharge_time, sd.limit_recharge_reason, + sd.last_online_time, sm.model_name as model, sm.picture as picture, sm.tags as model_tags, @@ -236,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/impl/PayBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/impl/PayBillServiceImpl.java index 4975f504..fe42a9db 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/impl/PayBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/impl/PayBillServiceImpl.java @@ -279,38 +279,41 @@ public class PayBillServiceImpl implements PayBillService ServiceUtil.assertion(payBill == null, "支付订单不存在"); Long lockKey = payBill.getPayId(); - ServiceUtil.assertion(redisLock.lock(RedisLockKey.PAY_BILL_SUCCESS, lockKey), "支付订单正在处理中:payId=" + payBill.getPayId()); +// ServiceUtil.assertion(redisLock.lock(RedisLockKey.PAY_BILL_SUCCESS, lockKey), "支付订单正在处理中:payId=" + payBill.getPayId()); try { - // 若已经支付成功，则跳过 - if (PayBillStatus.payedList().contains(payBill.getStatus())) { - return; + // 若不是支付成功的状态，则修改为支付成功 + if (!PayBillStatus.payedList().contains(payBill.getStatus())) { + ServiceUtil.assertion(!PayBillStatus.PAYING.getStatus().equals(payBill.getStatus()), "该支付订单不是正在支付的支付订单"); + + Integer result = transactionTemplate.execute(status -> { + // 修改支付订单状态 + PayBill data = new PayBill(); + data.setStatus(PayBillStatus.PAY_SUCCESS.getStatus()); + data.setPayTime(payTime); + PayBillQuery query = new PayBillQuery(); + query.setStatus(PayBillStatus.PAYING.getStatus()); + query.setPayId(payBill.getPayId()); + int update = this.updateByQuery(data, query); + ServiceUtil.assertion(update != 1, "支付订单状态已改变，请稍后再试"); + + return update; + }); } - ServiceUtil.assertion(!PayBillStatus.PAYING.getStatus().equals(payBill.getStatus()), "该支付订单不是正在支付的支付订单"); - transactionTemplate.execute(status -> { - // 修改支付订单状态 - PayBill data = new PayBill(); - data.setStatus(PayBillStatus.PAY_SUCCESS.getStatus()); - data.setPayTime(payTime); - PayBillQuery query = new PayBillQuery(); - query.setStatus(PayBillStatus.PAYING.getStatus()); - query.setPayId(payBill.getPayId()); - int update = this.updateByQuery(data, query); - ServiceUtil.assertion(update != 1, "支付订单状态已改变，请稍后再试"); - - // 处理业务 + // 获取修改后的数据 + PayBillVO bill = this.selectPayBillByPayId(payBill.getPayId()); + // 若为成功，则处理业务 + if (PayBillStatus.PAY_SUCCESS.getStatus().equals(bill.getStatus())) { PayBillBstType bstType = PayBillBstType.parse(payBill.getBstType()); if (bstType != null && bstType.getAfterPay() != null) { PayBillVO newPayBill = selectPayBillByPayId(payBill.getPayId()); AfterPay afterPay = SpringUtils.getBean(bstType.getAfterPay()); int bstResult = afterPay.onPaySuccess(newPayBill); ServiceUtil.assertion(bstResult == 0, "业务处理失败"); - } - - return update; - }); + }; + } } finally { - redisLock.unlock(RedisLockKey.PAY_BILL_SUCCESS, lockKey); +// redisLock.unlock(RedisLockKey.PAY_BILL_SUCCESS, lockKey); } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillServiceImpl.java index 6d70f52f..56f48d2c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillServiceImpl.java @@ -174,7 +174,7 @@ public class TimeBillServiceImpl implements TimeBillService, AfterPay ServiceUtil.assertion(insert != 1, "下单失败，请稍后再试"); // 开启设备 - boolean open = iotService.open(device.getMac(), device.getModelProductId()); + boolean open = iotService.open(device); ServiceUtil.assertion(!open, "开启设备失败，请稍后再试"); return insert; @@ -219,7 +219,7 @@ public class TimeBillServiceImpl implements TimeBillService, AfterPay // 关闭设备 DeviceVO device = deviceService.selectSmDeviceByDeviceId(bill.getDeviceId()); ServiceUtil.assertion(device == null, "设备不存在"); - boolean close = iotService.close(device.getMac(), device.getModelProductId()); + boolean close = iotService.close(device); ServiceUtil.assertion(!close, "关闭设备失败，请检查设备是否在线"); return update; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java index cf2faf65..e82d489a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java @@ -218,6 +218,11 @@ public class TransactionBill extends BaseEntity implements Payable @JsonView(JsonViewProfile.App.class) private String deviceMac; + @Excel(name = "设备MAC2") + @ApiModelProperty("设备MAC2") + @JsonView(JsonViewProfile.App.class) + private String deviceMac2; + @ApiModelProperty("总计退款金额") @JsonView(JsonViewProfile.App.class) private BigDecimal refundAmount; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java index eb6aa9a9..0b5faccf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java @@ -2,6 +2,7 @@ package com.ruoyi.ss.transactionBill.domain.vo; import com.fasterxml.jackson.annotation.JsonView; import com.ruoyi.common.core.domain.JsonViewProfile; +import com.ruoyi.iot.interfaces.IotDevice; import com.ruoyi.ss.suit.domain.enums.SuitTimeUnit; import com.ruoyi.ss.transactionBill.domain.TransactionBill; import io.swagger.annotations.ApiModel; @@ -16,7 +17,7 @@ import java.math.BigDecimal; */ @ApiModel @Data -public class TransactionBillVO extends TransactionBill { +public class TransactionBillVO extends TransactionBill implements IotDevice { @ApiModelProperty("用户名称") @JsonView(JsonViewProfile.App.class) private String userName; @@ -65,4 +66,18 @@ public class TransactionBillVO extends TransactionBill { return time * unit.getConversion(); } + @Override + public String getMac1() { + return getDeviceMac(); + } + + @Override + public String getMac2() { + return getDeviceMac2(); + } + + @Override + public String getProductId() { + return getDeviceProductId(); + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml index d334ea16..7310fafb 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml @@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stb.device_no, stb.suit_name, stb.device_mac, + stb.device_mac2, stb.refund_amount, stb.refund_mch_amount, stb.refund_service_amount, @@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and su1.user_name like concat('%', #{query.mchName}, '%') and stb.device_name like concat('%', #{query.deviceName}, '%') and stb.device_mac = #{query.deviceMac} + and stb.device_mac2 = #{query.deviceMac2} and stb.create_time = #{query.createTime} and date(stb.create_time) = date(#{query.createDate}) and year(stb.create_time) = #{query.year} @@ -433,6 +435,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_no, suit_name, device_mac, + device_mac2, refund_amount, refund_mch_amount, refund_service_amount, @@ -486,6 +489,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceNo}, #{suitName}, #{deviceMac}, + #{deviceMac2}, #{refundAmount}, #{refundMchAmount}, #{refundServiceAmount}, @@ -517,7 +521,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where stb.bill_id = #{data.billId} - stb.user_id = #{data.userId}, stb.`type` = #{data.type}, @@ -557,6 +560,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stb.device_no = #{data.deviceNo}, stb.suit_name = #{data.suitName}, stb.device_mac = #{data.deviceMac}, + stb.device_mac2 = #{data.deviceMac2}, stb.refund_amount = #{data.refundAmount}, stb.refund_mch_amount = #{data.refundMchAmount}, stb.refund_service_amount = #{data.refundServiceAmount}, @@ -568,6 +572,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" suit_enable_low_power_close = #{data.suitEnableLowPowerClose}, suit_low_power = #{data.suitLowPower}, device_product_id = #{data.deviceProductId}, + device_recharge_status = #{data.deviceRechargeStatus}, @@ -663,7 +668,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sm_transaction_bill set device_recharge_status = #{status} - where bill_id = #{billId} and `type` = '1' and device_recharge_status != '1' + where bill_id = #{billId} and `type` = '1' and device_recharge_status not in('1', '3') diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargeDepositAfterPay.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargeDepositAfterPay.java index 378e4358..0324d11a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargeDepositAfterPay.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargeDepositAfterPay.java @@ -65,7 +65,7 @@ public class RechargeDepositAfterPay implements AfterPay { ServiceUtil.assertion(update != 1, "修改订单信息失败，状态已经发生改变"); try { - iotService.open(device.getMac(), device.getModelProductId()); + iotService.open(device); } catch (Exception e) { log.error(e.getMessage()); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java index cb591c4e..349bce9e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java @@ -2,11 +2,8 @@ package com.ruoyi.ss.transactionBill.service.impl; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.ValidateResult; import com.ruoyi.common.core.redis.RedisLock; import com.ruoyi.common.core.redis.enums.RedisLockKey; -import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.enums.WithdrawServiceType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.*; @@ -390,6 +387,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After order.setMchId(mch.getUserId()); order.setDeviceName(device.getDeviceName()); order.setDeviceMac(device.getMac()); + order.setDeviceMac2(device.getMac2()); order.setDeviceProductId(device.getModelProductId()); // 店铺信息 @@ -753,7 +751,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After @Override public boolean rechargeDevice(Long billId) { ServiceUtil.assertion(billId == null, "参数错误,billId不允许为空"); - ServiceUtil.assertion(!redisLock.lock(RedisLockKey.RECHARGE_DEVICE, billId), "当前设备充值请求过于频繁，请等待"); +// ServiceUtil.assertion(!redisLock.lock(RedisLockKey.RECHARGE_DEVICE, billId), "当前设备充值请求过于频繁，请等待"); try { TransactionBillVO bill = transactionBillMapper.selectSmTransactionBillByBillId(billId); ServiceUtil.assertion(bill == null || !TransactionBillType.RECHARGE.getType().equals(bill.getType()), "不存在的充值订单"); @@ -796,7 +794,8 @@ public class TransactionBillServiceImpl implements TransactionBillService, After openTime = openTime.add(device.getSurplusEle().abs()); } // 设备充值电量 - CommandResponse res = iotService.addEle(device.getMac(), openTime, device.getModelProductId()); + CommandResponse res = iotService.addEle(device, openTime); + ServiceUtil.assertion(res == null, "设备充值失败，返回数据为空"); ServiceUtil.assertion(!res.isSuccess(), "设备充值失败:" + res.getMsg()); return true; } else { @@ -822,7 +821,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After return success; } finally { - redisLock.unlock(RedisLockKey.RECHARGE_DEVICE, billId); +// redisLock.unlock(RedisLockKey.RECHARGE_DEVICE, billId); } } @@ -889,9 +888,9 @@ public class TransactionBillServiceImpl implements TransactionBillService, After return updateCount; }); - // 异步充值设备，尝试3次 + // 充值设备，尝试1次 if (result != null && result == 1) { - this.tryRechargeDevice(bill.getBillId(), 3); + this.tryRechargeDevice(bill.getBillId(), 1); } return result == null ? 0 : result; @@ -906,14 +905,14 @@ public class TransactionBillServiceImpl implements TransactionBillService, After if (tryCount <= 0) { return; } - scheduledExecutorService.schedule(()-> { - try { - boolean result = rechargeDevice(billId); - ServiceUtil.assertion(!result, String.format("尝试充值设备失败:billId=%s:剩余次数:%s,", billId, tryCount - 1)); - } catch (Exception e) { - this.tryRechargeDevice(billId, tryCount - 1); - } - }, 0, TimeUnit.SECONDS); +// scheduledExecutorService.schedule(()-> { + try { + boolean result = rechargeDevice(billId); + ServiceUtil.assertion(!result, String.format("尝试充值设备失败:billId=%s:剩余次数:%s,", billId, tryCount - 1)); + } catch (Exception e) { + this.tryRechargeDevice(billId, tryCount - 1); + } +// }, 0, TimeUnit.SECONDS); } @Override @@ -973,7 +972,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After } else if(SuitFeeType.TIMING_TIME.getType().equals(order.getSuitFeeType())){ deviceService.resetTime(device, true); } - iotService.close(device.getMac(), device.getModelProductId()); + iotService.close(device); } catch (Exception e) { log.error("尝试关闭设备失败"); } @@ -1367,6 +1366,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After dto.setStatus(TransactionBillStatus.SUCCESS.getStatus()); dto.setDeviceRechargeStatus(TransactionBillDeviceRechargeStatus.FAIL.getStatus()); dto.setType(TransactionBillType.RECHARGE.getType()); + dto.setIsFinished(false); List list = this.selectSmTransactionBillList(dto); if (!CollectionUtils.isEmptyElement(list)) { @@ -1450,10 +1450,17 @@ public class TransactionBillServiceImpl implements TransactionBillService, After // 拉取设备信息 deviceService.pullDeviceInfo(bill.getDeviceId()); - Boolean execute = transactionTemplate.execute(status -> { + Integer execute = transactionTemplate.execute(status -> { // 更新设备充值状态 - boolean result = transactionBillMapper.bluetoothRechargeSuccess(billNo) == 1; - ServiceUtil.assertion(!result, "蓝牙充值回调失败"); + TransactionBill data = new TransactionBill(); + data.setDeviceRechargeStatus(TransactionBillDeviceRechargeStatus.SUCCESS.getStatus()); + TransactionBillQuery query = new TransactionBillQuery(); + query.setBillId(bill.getBillId()); + query.setType(TransactionBillType.RECHARGE.getType()); + query.setDeviceRechargeStatus(TransactionBillDeviceRechargeStatus.BLUETOOTH.getStatus()); + query.setStatus(TransactionBillStatus.SUCCESS.getStatus()); + int result = this.updateByQuery(data, query); + ServiceUtil.assertion( result != 1, "蓝牙充值回调失败，设备状态已发生改变"); // 更新套餐使用信息 DeviceVO device = deviceService.selectSmDeviceByDeviceId(bill.getDeviceId()); @@ -1468,7 +1475,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After }); // 是否成功 - boolean success = execute != null && execute; + boolean success = execute != null && execute == 1; // 成功后操作 if (success) { // 时长变化记录 @@ -1678,9 +1685,9 @@ public class TransactionBillServiceImpl implements TransactionBillService, After ServiceUtil.assertion(StringUtils.isBlank(device.getMac()), "设备MAC为空，请联系管理员处理"); if (open) { - return iotService.open(device.getMac(), device.getModelProductId()) ? 1 : 0; + return iotService.open(device) ? 1 : 0; } else { - return iotService.close(device.getMac(), device.getModelProductId()) ? 1 : 0; + return iotService.close(device) ? 1 : 0; } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/dto/UserUpdatePasswordDTO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/dto/UserUpdatePasswordDTO.java new file mode 100644 index 00000000..dcb2232e --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/dto/UserUpdatePasswordDTO.java @@ -0,0 +1,24 @@ +package com.ruoyi.ss.user.domain.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + +/** + * @author wjh + * 2024/9/25 + */ +@Data +public class UserUpdatePasswordDTO { + + @ApiModelProperty("旧密码") + private String oldPassword; + + @ApiModelProperty("新密码") + @NotBlank(message = "新密码不能为空") + @Size(min = 6, max = 32, message = "新密码长度应该在6~32个字符之间") + private String newPassword; + +} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java index 50aa7ea8..b2b62357 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java @@ -481,6 +481,9 @@ public class SmUserServiceImpl implements ISmUserService public int insertSmUser(SmUser smUser) { this.validate(smUser, false); + if (StringUtils.hasText(smUser.getPassword())) { + smUser.setPassword(SecurityUtils.encryptPassword(smUser.getPassword())); + } smUser.setCreateTime(DateUtils.getNowDate()); return smUserMapper.insertSmUser(smUser); } @@ -525,6 +528,9 @@ public class SmUserServiceImpl implements ISmUserService public int updateSmUser(SmUser smUser) { this.validate(smUser, true); + if (StringUtils.hasText(smUser.getPassword())) { + smUser.setPassword(SecurityUtils.encryptPassword(smUser.getPassword())); + } smUser.setUpdateTime(DateUtils.getNowDate()); return smUserMapper.updateSmUser(smUser); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillLowPowerTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillLowPowerTask.java index 97db8265..5b2a24f3 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillLowPowerTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillLowPowerTask.java @@ -67,13 +67,13 @@ public class BillLowPowerTask { } try { // 判断设备是否在线 - DeviceOnlineStatus online = iotService.getOnlineStatus(bill.getDeviceMac(), bill.getDeviceProductId()); + DeviceOnlineStatus online = iotService.getOnlineStatus(bill); if (!DeviceOnlineStatus.ONLINE.equals(online)) { log.warn("关闭低功率订单{}时，设备未在线", bill.getBillNo()); continue; } - IotDeviceInfo deviceInfo = iotService.getDeviceInfo(bill.getDeviceMac(), bill.getDeviceProductId()); + IotDeviceInfo deviceInfo = iotService.getDeviceInfo(bill); // 判断是否低功率，若低于指定功率，则关闭订单 if (deviceInfo != null && deviceInfo.getP() != null && deviceInfo.getP().compareTo(bill.getSuitLowPower()) < 0) { EndUseDTO dto = new EndUseDTO(); diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java index 723233ff..9f4396ff 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java @@ -23,6 +23,8 @@ import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.device.service.DeviceService; import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecordQuery; import com.ruoyi.ss.meterReadingRecord.service.ISmMeterReadingRecordService; +import com.ruoyi.ss.suit.domain.enums.SuitFeeType; +import com.ruoyi.ss.suit.domain.enums.SuitTimeUnit; import com.ruoyi.web.core.annotation.DeviceAdminRequired; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.Collections; import java.util.List; @@ -128,9 +131,9 @@ public class AppDeviceController extends BaseController { @Log(title = "设备归零", businessType = BusinessType.OTHER, operatorType = OperatorType.MOBILE) @ApiOperation("设备归零") @PutMapping("{deviceId}/reset") - public AjaxResult reset(@PathVariable @ApiParam("设备id") Long deviceId) { - int r1 = smDeviceService.resetTimeWithBill(deviceId); - int r2 = smDeviceService.resetEleWithBill(deviceId); + public AjaxResult reset(@PathVariable @ApiParam("设备id") Long deviceId, @RequestParam(required = false, defaultValue = "true") Boolean requiredIot) { + int r1 = smDeviceService.resetTimeWithBill(deviceId, requiredIot); + int r2 = smDeviceService.resetEleWithBill(deviceId, requiredIot); return toAjax(r1 >= 0 && r2 >= 0); } @@ -141,15 +144,31 @@ public class AppDeviceController extends BaseController { return success(smMeterReadingRecordService.selectCount(dto)); } - @Log(title = "设备充值时长", businessType = BusinessType.OTHER, operatorType = OperatorType.MOBILE) - @ApiOperation("设备充值时长") + @Log(title = "商户充值设备", businessType = BusinessType.OTHER, operatorType = OperatorType.MOBILE) + @ApiOperation("商户充值设备") @PutMapping("/addTime/{deviceId}") - public AjaxResult addTime(@PathVariable @ApiParam("设备id") Long deviceId, @ApiParam("时长（分钟）") Long amount) - { + public AjaxResult addTime(@PathVariable @ApiParam("设备id") Long deviceId, + @ApiParam("数值") @RequestParam BigDecimal amount, + @ApiParam("单位") @RequestParam(required = false, defaultValue = "3") String timeUnit, + @ApiParam("是否操作物联网设备") @RequestParam(required = false, defaultValue = "true") Boolean withIot + ) { ServiceUtil.assertion(!deviceValidator.isBelong(deviceId, getUserId()), "这不是您的设备"); DeviceVO device = smDeviceService.selectSmDeviceByDeviceId(deviceId); ServiceUtil.assertion(device == null || !getUserId().equals(device.getUserId()), "设备不存在或您无权充值"); - return toAjax(smDeviceService.addTimeByUser(deviceId, amount * 60, true, "商户手动充值")); + + // 电量 + if ( "0".equals(timeUnit)) { + return toAjax(smDeviceService.addEle(deviceId, amount, withIot, "商户手动充值")); + } + // 时长 + else { + SuitTimeUnit unit = SuitTimeUnit.getByValue(timeUnit); + if (unit == null) { + return error("非法的时长单位"); + } + long seconds = amount.multiply(new BigDecimal(unit.getConversion())).longValue(); + return toAjax(smDeviceService.addTimeByUser(deviceId, seconds, withIot, "商户手动充值")); + } } @ApiOperation("刷新设备信息") diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java index 067a7422..20ea7626 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java @@ -354,4 +354,14 @@ public class AppTransactionBillController extends BaseController return success(transactionBillService.pay(bo)); } + @ApiOperation("充值订单设备") + @PutMapping("/rechargeBillDevice") + public AjaxResult rechargeBillDevice(@RequestParam String billNo) { + TransactionBillVO bill = transactionBillService.selectSmTransactionBillByBillNo(billNo); + if (bill == null) { + return error("订单不存在"); + } + return success(transactionBillService.rechargeDevice(bill.getBillId())); + } + } diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java index 0c51e931..07e24479 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java @@ -5,12 +5,18 @@ import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.JsonViewProfile; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.web.service.SysPasswordService; +import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.ss.user.domain.bo.SmUserBO; import com.ruoyi.ss.user.domain.SmUserVo; import com.ruoyi.ss.user.domain.dto.UserRealNameDTO; +import com.ruoyi.ss.user.domain.dto.UserUpdatePasswordDTO; import com.ruoyi.ss.user.service.ISmUserService; import com.ruoyi.ss.user.service.UserAssembler; import com.ruoyi.system.domain.enums.verificationCode.CodeBusinessType; @@ -43,6 +49,12 @@ public class AppUserController extends BaseController { @Autowired private UserAssembler userAssembler; + @Autowired + private SysPasswordService passwordService; + + @Autowired + private TokenService tokenService; + @ApiOperation("获取当前登录前台用户的信息") @GetMapping("/userInfo") @JsonView(JsonViewProfile.AppMch.class) @@ -64,12 +76,28 @@ public class AppUserController extends BaseController { return AjaxResult.success(userService.changeType(getUserId(), UserType.parse(userType))); } - @ApiOperation("修改密码") + @ApiOperation("使用旧密码修改密码") @PutMapping("/updatePassword") - public AjaxResult updatePassword(SmUserBO bo) { - ServiceUtil.assertion(!verificationCodeService.checkCode(bo.getPhonenumber(), bo.getMobileCode(), CodeBusinessType.UPDATE_PASSWORD, true), - "短信验证码错误，请重试"); - return AjaxResult.success(userService.updatePassword(getUserId(), bo.getPassword())); + public AjaxResult updatePassword( @RequestBody @Validated UserUpdatePasswordDTO dto) { + SmUserVo user = userService.selectSmUserByUserId(getUserId()); + if (user == null) { + return error("用户不存在"); + } + // 若有设置旧密码，则应该判断旧密码是否正确 + if (StringUtils.hasText(user.getPassword()) && !passwordService.matches(user, dto.getOldPassword())) { + return error("旧密码错误"); + } + + return toAjax(userService.updatePassword(getUserId(), dto.getNewPassword())); + } + + @ApiOperation("退出登录") + @DeleteMapping("/logout") + public AjaxResult logout() { + // 删除用户缓存记录 + LoginUser loginUser = SecurityUtils.getLoginUser(); + tokenService.delLoginUser(loginUser.getToken()); + return success(); } @ApiOperation("用户实名认证") diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmUserController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmUserController.java index d6d92e36..39046d36 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmUserController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmUserController.java @@ -58,6 +58,7 @@ public class SmUserController extends BaseController List list = smUserService.selectSmUserList(smUser); userAssembler.assembleStoreCount(list); userAssembler.assembleDeviceCount(list); + smUserService.desensitization(list); return getDataTable(list); } @@ -96,6 +97,7 @@ public class SmUserController extends BaseController List list = Collections.singletonList(user); userAssembler.assembleStoreCount(list); userAssembler.assembleDeviceCount(list); + smUserService.desensitization(list); return success(user); }