diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/accountExist/AccountExistValidator.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/accountExist/AccountExistValidator.java index c0b748d9..9cd94557 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/accountExist/AccountExistValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/accountExist/AccountExistValidator.java @@ -4,8 +4,6 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.ss.account.domain.AccountQuery; import com.ruoyi.ss.account.service.AccountService; -import com.ruoyi.ss.device.domain.DeviceQuery; -import com.ruoyi.ss.device.service.DeviceService; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/allowSize/AllowSizeValidator.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/allowSize/AllowSizeValidator.java index 3a7cb16c..d3b0a1c4 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/allowSize/AllowSizeValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/allowSize/AllowSizeValidator.java @@ -1,14 +1,9 @@ package com.ruoyi.common.validRule.allowSize; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery; -import com.ruoyi.ss.apiPrice.service.ApiPriceService; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** * 2023/10/20 diff --git a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/deviceNoExist/DeviceNoExistValidator.java b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/deviceNoExist/DeviceNoExistValidator.java index cbdcb8d1..7473b13a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/common/validRule/deviceNoExist/DeviceNoExistValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/common/validRule/deviceNoExist/DeviceNoExistValidator.java @@ -1,8 +1,6 @@ package com.ruoyi.common.validRule.deviceNoExist; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.ss.device.domain.DeviceQuery; import com.ruoyi.ss.device.service.DeviceService; import javax.validation.ConstraintValidator; diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java b/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java index 7dfaf976..7c37d1f2 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java @@ -32,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; import java.util.List; 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 index 39ff6580..eb39e591 100644 --- 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 @@ -7,10 +7,10 @@ package com.ruoyi.iot.interfaces; public interface IotDevice { // 获取MAC-1 - String getMac1(); + String iotMac1(); // 获取MAC-2 - String getMac2(); + String iotMac2(); // 获取OneNet产品ID String getProductId(); 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 94462530..e0f6493e 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 @@ -80,12 +80,12 @@ public class IotServiceImpl implements IotService { return status; } // 优先使用mac1判断 - if (StringUtils.hasText(device.getMac1())) { - status = this.getOnlineStatus(device.getMac1(), device.getProductId()); + if (StringUtils.hasText(device.iotMac1())) { + status = this.getOnlineStatus(device.iotMac1(), device.getProductId()); } // 若还是离线，则判断mac2是否在线 - if (status == DeviceOnlineStatus.OFFLINE && StringUtils.hasText(device.getMac2())) { - status = this.getOnlineStatus(device.getMac2(), device.getProductId()); + if (status == DeviceOnlineStatus.OFFLINE && StringUtils.hasText(device.iotMac2())) { + status = this.getOnlineStatus(device.iotMac2(), device.getProductId()); } return status; } @@ -113,13 +113,13 @@ public class IotServiceImpl implements IotService { // 尝试用mac1通电 try { - result = this.open(device.getMac1(), device.getProductId()); + result = this.open(device.iotMac1(), device.getProductId()); if (!result) { throw new ServiceException("mac1通电失败"); } } catch (Exception e) { log.info("mac1通电失败，尝试用mac2通电"); - result = this.open(device.getMac2(), device.getProductId()); + result = this.open(device.iotMac2(), device.getProductId()); } return result; @@ -145,13 +145,13 @@ public class IotServiceImpl implements IotService { // 尝试用mac1断电 try { - result = this.close(device.getMac1(), device.getProductId()); + result = this.close(device.iotMac1(), device.getProductId()); if (!result) { throw new ServiceException("mac1断电失败"); } } catch (Exception e) { log.info("mac1断电失败，尝试用mac2断电"); - result = this.close(device.getMac2(), device.getProductId()); + result = this.close(device.iotMac2(), device.getProductId()); } return result; @@ -253,11 +253,11 @@ public class IotServiceImpl implements IotService { } CommandResponse res = null; - if (StringUtils.hasText(device.getMac1())) { - res = this.setTime(device.getMac1(), seconds, device.getProductId()); + if (StringUtils.hasText(device.iotMac1())) { + res = this.setTime(device.iotMac1(), seconds, device.getProductId()); } - if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) { - res = this.setTime(device.getMac2(), seconds, device.getProductId()); + if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac2())) { + res = this.setTime(device.iotMac2(), seconds, device.getProductId()); } return res; @@ -279,11 +279,11 @@ public class IotServiceImpl implements IotService { } CommandResponse res = null; - if (StringUtils.hasText(device.getMac1())) { - res = this.addEle(device.getMac1(), ele, device.getProductId()); + if (StringUtils.hasText(device.iotMac1())) { + res = this.addEle(device.iotMac1(), ele, device.getProductId()); } - if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) { - res = this.addEle(device.getMac2(), ele, device.getProductId()); + if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac2())) { + res = this.addEle(device.iotMac2(), ele, device.getProductId()); } return res; @@ -304,11 +304,11 @@ public class IotServiceImpl implements IotService { } CommandResponse res = null; - if (StringUtils.hasText(device.getMac1())) { - res = this.setEle(device.getMac1(), ele, device.getProductId()); + if (StringUtils.hasText(device.iotMac1())) { + res = this.setEle(device.iotMac1(), ele, device.getProductId()); } - if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) { - res = this.setEle(device.getMac2(), ele, device.getProductId()); + if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac2())) { + res = this.setEle(device.iotMac2(), ele, device.getProductId()); } return res; @@ -333,11 +333,11 @@ public class IotServiceImpl implements IotService { return info; } - if (StringUtils.hasText(device.getMac1())) { - info = getDeviceInfo(device.getMac1(), device.getProductId()); + if (StringUtils.hasText(device.iotMac1())) { + info = getDeviceInfo(device.iotMac1(), device.getProductId()); } - if (info == null && StringUtils.hasText(device.getMac2())) { - info = getDeviceInfo(device.getMac2(), device.getProductId()); + if (info == null && StringUtils.hasText(device.iotMac2())) { + info = getDeviceInfo(device.iotMac2(), device.getProductId()); } return info; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalVO.java index 02c4c37e..7492cc7c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalVO.java @@ -1,13 +1,8 @@ package com.ruoyi.ss.abnormal.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.ValidGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - /** * @author wjh * 2024/4/30 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/AbnormalValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/AbnormalValidator.java index 88a34300..09196f8e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/AbnormalValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/AbnormalValidator.java @@ -1,8 +1,5 @@ package com.ruoyi.ss.abnormal.service; -import com.ruoyi.common.core.domain.ValidateResult; -import com.ruoyi.ss.abnormal.domain.dto.AbnormalSubmitDTO; - /** * @author wjh * 2024/4/30 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalValidatorImpl.java index 16853029..ed2a394c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalValidatorImpl.java @@ -1,16 +1,12 @@ package com.ruoyi.ss.abnormal.service.impl; import com.ruoyi.common.core.domain.BaseValidator; -import com.ruoyi.common.core.domain.ValidateResult; -import com.ruoyi.ss.abnormal.domain.dto.AbnormalSubmitDTO; import com.ruoyi.ss.abnormal.service.AbnormalValidator; -import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.device.service.DeviceService; +import com.ruoyi.ss.device.service.DeviceValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; - /** * @author wjh * 2024/4/30 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/Access.java b/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/Access.java index a4f84074..83ed1b0e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/Access.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/Access.java @@ -1,13 +1,11 @@ package com.ruoyi.ss.access.domain; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.enums.DesensitizedType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import java.time.LocalDateTime; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/dto/AccessLoginDTO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/dto/AccessLoginDTO.java index 38046002..0d77a55e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/dto/AccessLoginDTO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/dto/AccessLoginDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.ss.access.domain.dto; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/vo/AccessApplyVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/vo/AccessApplyVO.java index 50c7b38a..dd609cb6 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/vo/AccessApplyVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/vo/AccessApplyVO.java @@ -1,7 +1,6 @@ package com.ruoyi.ss.access.domain.vo; import com.ruoyi.ss.access.domain.Access; -import com.ruoyi.ss.access.domain.AccessVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/access/mapper/AccessMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/access/mapper/AccessMapper.java index 6614051b..fd4e090d 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/access/mapper/AccessMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/access/mapper/AccessMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.access.mapper; -import java.util.List; import com.ruoyi.ss.access.domain.Access; import com.ruoyi.ss.access.domain.AccessQuery; import com.ruoyi.ss.access.domain.AccessVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 第三方API秘钥对Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/AccessService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/AccessService.java index d49fb3ac..89bbb8e1 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/AccessService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/AccessService.java @@ -1,13 +1,13 @@ package com.ruoyi.ss.access.service; -import java.util.List; - import com.ruoyi.ss.access.domain.Access; import com.ruoyi.ss.access.domain.AccessQuery; import com.ruoyi.ss.access.domain.AccessVO; import com.ruoyi.ss.access.domain.vo.AccessApplyVO; import com.ruoyi.ss.user.domain.SmUserVo; +import java.util.List; + /** * 第三方API秘钥对Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/impl/AccessServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/impl/AccessServiceImpl.java index cc27d3fb..9cd5d0e5 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/impl/AccessServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/access/service/impl/AccessServiceImpl.java @@ -1,26 +1,25 @@ package com.ruoyi.ss.access.service.impl; -import java.util.List; -import java.util.concurrent.TimeUnit; - import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisLock; import com.ruoyi.common.core.redis.enums.RedisLockKey; import com.ruoyi.common.utils.*; import com.ruoyi.common.utils.collection.CollectionUtils; +import com.ruoyi.ss.access.domain.Access; import com.ruoyi.ss.access.domain.AccessQuery; import com.ruoyi.ss.access.domain.AccessVO; import com.ruoyi.ss.access.domain.vo.AccessApplyVO; +import com.ruoyi.ss.access.mapper.AccessMapper; +import com.ruoyi.ss.access.service.AccessService; import com.ruoyi.ss.user.domain.SmUserVo; import com.ruoyi.ss.user.service.ISmUserService; import org.eclipse.jetty.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import com.ruoyi.ss.access.mapper.AccessMapper; -import com.ruoyi.ss.access.domain.Access; -import com.ruoyi.ss.access.service.AccessService; + +import java.util.List; /** * 第三方API秘钥对Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java index 1f65235c..a76b30c0 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java @@ -11,7 +11,6 @@ import com.ruoyi.ss.account.domain.enums.AccountType; import com.ruoyi.ss.account.mapper.AccountMapper; import com.ruoyi.ss.account.service.AccountAssembler; import com.ruoyi.ss.account.service.AccountService; -import com.ruoyi.ss.channel.service.ChannelService; import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO; import com.ruoyi.ss.channelWithdraw.service.ChannelWithdrawService; import org.apache.commons.lang3.StringUtils; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/domain/Ad.java b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/domain/Ad.java index ccfe8160..47822e29 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/domain/Ad.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/domain/Ad.java @@ -1,15 +1,11 @@ package com.ruoyi.ss.ad.domain; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.valid.EnumValid; import com.ruoyi.ss.ad.domain.enums.AdUrlType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import javax.validation.constraints.NotNull; /** * 广告对象 ss_ad diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/mapper/AdMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/mapper/AdMapper.java index 5adae4ac..baa5ba3e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/mapper/AdMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/mapper/AdMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.ad.mapper; -import java.util.List; import com.ruoyi.ss.ad.domain.Ad; import com.ruoyi.ss.ad.domain.AdQuery; import com.ruoyi.ss.ad.domain.AdVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 广告Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/IAdService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/IAdService.java index 0c9a076c..ff33cc6f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/IAdService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/IAdService.java @@ -1,10 +1,11 @@ package com.ruoyi.ss.ad.service; -import java.util.List; import com.ruoyi.ss.ad.domain.Ad; import com.ruoyi.ss.ad.domain.AdQuery; import com.ruoyi.ss.ad.domain.AdVO; +import java.util.List; + /** * 广告Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/impl/AdServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/impl/AdServiceImpl.java index f13bf9be..512336bc 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/impl/AdServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/impl/AdServiceImpl.java @@ -1,14 +1,15 @@ package com.ruoyi.ss.ad.service.impl; -import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.ss.ad.domain.Ad; import com.ruoyi.ss.ad.domain.AdQuery; import com.ruoyi.ss.ad.domain.AdVO; +import com.ruoyi.ss.ad.mapper.AdMapper; +import com.ruoyi.ss.ad.service.IAdService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.ad.mapper.AdMapper; -import com.ruoyi.ss.ad.domain.Ad; -import com.ruoyi.ss.ad.service.IAdService; + +import java.util.List; /** * 广告Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/domain/ApiBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/domain/ApiBill.java index 0c3d260b..f28a3833 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/domain/ApiBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/domain/ApiBill.java @@ -1,14 +1,13 @@ package com.ruoyi.ss.apiBill.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; /** * API收费订单对象 ss_api_bill diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/mapper/ApiBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/mapper/ApiBillMapper.java index 3651aa37..b711ca37 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/mapper/ApiBillMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/mapper/ApiBillMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.apiBill.mapper; -import java.util.List; import com.ruoyi.ss.apiBill.domain.ApiBill; -import com.ruoyi.ss.apiBill.domain.ApiBillVO; import com.ruoyi.ss.apiBill.domain.ApiBillQuery; +import com.ruoyi.ss.apiBill.domain.ApiBillVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * API收费订单Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/ApiBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/ApiBillService.java index ed9d29f8..bc286cbf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/ApiBillService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/ApiBillService.java @@ -1,9 +1,10 @@ package com.ruoyi.ss.apiBill.service; -import java.util.List; import com.ruoyi.ss.apiBill.domain.ApiBill; -import com.ruoyi.ss.apiBill.domain.ApiBillVO; import com.ruoyi.ss.apiBill.domain.ApiBillQuery; +import com.ruoyi.ss.apiBill.domain.ApiBillVO; + +import java.util.List; /** * API收费订单Service接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/impl/ApiBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/impl/ApiBillServiceImpl.java index 0fb5cb82..2c24180f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/impl/ApiBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/impl/ApiBillServiceImpl.java @@ -1,14 +1,15 @@ package com.ruoyi.ss.apiBill.service.impl; -import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.ss.apiBill.domain.ApiBill; +import com.ruoyi.ss.apiBill.domain.ApiBillQuery; +import com.ruoyi.ss.apiBill.domain.ApiBillVO; +import com.ruoyi.ss.apiBill.mapper.ApiBillMapper; +import com.ruoyi.ss.apiBill.service.ApiBillService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.apiBill.mapper.ApiBillMapper; -import com.ruoyi.ss.apiBill.domain.ApiBill; -import com.ruoyi.ss.apiBill.domain.ApiBillVO; -import com.ruoyi.ss.apiBill.domain.ApiBillQuery; -import com.ruoyi.ss.apiBill.service.ApiBillService; + +import java.util.List; /** * API收费订单Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/domain/ApiPrice.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/domain/ApiPrice.java index 4f9438bf..09395dbf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/domain/ApiPrice.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/domain/ApiPrice.java @@ -1,22 +1,19 @@ package com.ruoyi.ss.apiPrice.domain; -import java.math.BigDecimal; - +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.constants.DictTypeConstants; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.validRule.apiPriceExist.ApiPriceExist; import com.ruoyi.system.valid.DictValid; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import java.math.BigDecimal; /** * API收费标准对象 ss_api_price diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/mapper/ApiPriceMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/mapper/ApiPriceMapper.java index 45c39084..cdf965fd 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/mapper/ApiPriceMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/mapper/ApiPriceMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.apiPrice.mapper; -import java.util.List; import com.ruoyi.ss.apiPrice.domain.ApiPrice; -import com.ruoyi.ss.apiPrice.domain.ApiPriceVO; import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery; +import com.ruoyi.ss.apiPrice.domain.ApiPriceVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * API收费标准Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/ApiPriceService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/ApiPriceService.java index e6d7f7e4..489e5501 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/ApiPriceService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/ApiPriceService.java @@ -1,9 +1,10 @@ package com.ruoyi.ss.apiPrice.service; -import java.util.List; import com.ruoyi.ss.apiPrice.domain.ApiPrice; -import com.ruoyi.ss.apiPrice.domain.ApiPriceVO; import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery; +import com.ruoyi.ss.apiPrice.domain.ApiPriceVO; + +import java.util.List; /** * API收费标准Service接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/impl/ApiPriceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/impl/ApiPriceServiceImpl.java index a371f099..6a90c3d6 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/impl/ApiPriceServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/impl/ApiPriceServiceImpl.java @@ -1,14 +1,15 @@ package com.ruoyi.ss.apiPrice.service.impl; -import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.ss.apiPrice.domain.ApiPrice; +import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery; +import com.ruoyi.ss.apiPrice.domain.ApiPriceVO; +import com.ruoyi.ss.apiPrice.mapper.ApiPriceMapper; +import com.ruoyi.ss.apiPrice.service.ApiPriceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.apiPrice.mapper.ApiPriceMapper; -import com.ruoyi.ss.apiPrice.domain.ApiPrice; -import com.ruoyi.ss.apiPrice.domain.ApiPriceVO; -import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery; -import com.ruoyi.ss.apiPrice.service.ApiPriceService; + +import java.util.List; /** * API收费标准Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java index 79558296..8600f62b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java @@ -1,17 +1,15 @@ package com.ruoyi.ss.bonus.domain; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonView; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.JsonViewProfile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 分成明细对象 ss_bonus diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/BonusProvideQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/BonusProvideQuery.java index e10a5cdf..d9a7c12e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/BonusProvideQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/BonusProvideQuery.java @@ -2,7 +2,6 @@ package com.ruoyi.ss.bonus.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import nonapi.io.github.classgraph.utils.LogNode; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.java index f7a9fb6f..7ab4c108 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.java @@ -1,21 +1,20 @@ package com.ruoyi.ss.bonus.mapper; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - import com.ruoyi.common.domain.vo.CommonCountVO; import com.ruoyi.common.domain.vo.CommonSumVO; import com.ruoyi.ss.bonus.domain.Bonus; import com.ruoyi.ss.bonus.domain.BonusProvideQuery; -import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.ss.bonus.domain.BonusQuery; +import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.ss.bonus.domain.vo.BonusDailyAmountVO; import com.ruoyi.ss.bonus.domain.vo.BonusMonthAmountVO; import com.ruoyi.ss.bonus.domain.vo.ProvideBonusVO; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + /** * 分成明细Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml index 5d0f23bf..caa0f0be 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml @@ -231,7 +231,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, pay_time, dept_id, - pre_pay_time + pre_pay_time, + payed_amount, + wait_amount ) values @@ -264,6 +266,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" default, #{i.prePayTime}, default, + #{i.payedAmount}, + default, + #{i.waitAmount}, + default, diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusService.java index 486ddf7e..3e662c7e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusService.java @@ -1,18 +1,17 @@ package com.ruoyi.ss.bonus.service; -import java.math.BigDecimal; -import java.util.List; - import com.ruoyi.common.domain.vo.CommonCountVO; import com.ruoyi.common.domain.vo.CommonSumVO; import com.ruoyi.ss.bonus.domain.Bonus; import com.ruoyi.ss.bonus.domain.BonusProvideQuery; -import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.ss.bonus.domain.BonusQuery; +import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.ss.bonus.domain.vo.BonusDailyAmountVO; import com.ruoyi.ss.bonus.domain.vo.BonusMonthAmountVO; import com.ruoyi.ss.bonus.domain.vo.ProvideBonusVO; -import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO; + +import java.math.BigDecimal; +import java.util.List; /** * 分成明细Service接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java index d06f4654..a9ab9dfa 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.ss.bonus.service.impl; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.enums.ServiceType; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.ss.bonus.domain.Bonus; import com.ruoyi.ss.bonus.domain.enums.BonusArrivalType; @@ -26,7 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.*; +import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -145,11 +151,52 @@ public class BonusConverterImpl implements BonusConverter { if (bill == null) { return Collections.emptyList(); } + LocalDateTime payTime = DateUtils.toLocalDateTime(bill.getPayTime()); List result = new ArrayList<>(); + BigDecimal decimal100 = new BigDecimal("100"); + // TODO 平台 + // 平台百分比 + BigDecimal platformPoint = bill.getServiceCharge().multiply(decimal100).divide(bill.getMoney(), 2, RoundingMode.HALF_UP); + Bonus platformBonus = new Bonus(); + platformBonus.setBillId(bill.getBillId()); + platformBonus.setBillNo(bill.getBillNo()); + platformBonus.setStatus(BonusStatus.DIVIDEND.getStatus()); + platformBonus.setArrivalId(Constants.ROOT_DEPT); + platformBonus.setArrivalName("创特科技"); + platformBonus.setArrivalType(BonusArrivalType.PLATFORM.getType()); + platformBonus.setPoint(platformPoint); + platformBonus.setAmount(bill.getServiceCharge()); + platformBonus.setRefundAmount(bill.getRefundServiceAmount()); + platformBonus.setAncestors(""); + platformBonus.setDeptId(Constants.ROOT_DEPT); + platformBonus.setPayTime(payTime); + platformBonus.setPrePayTime(payTime); + platformBonus.setPayedAmount(bill.getServiceCharge().subtract(bill.getRefundServiceAmount())); + platformBonus.setWaitAmount(BigDecimal.ZERO); + result.add(platformBonus); // TODO 商户 + // 商户百分比 + BigDecimal mchPoint = decimal100.subtract(platformPoint); + Bonus mchBonus = new Bonus(); + mchBonus.setBillId(bill.getBillId()); + mchBonus.setBillNo(bill.getBillNo()); + mchBonus.setStatus(BonusStatus.DIVIDEND.getStatus()); + mchBonus.setArrivalId(bill.getMchId()); + mchBonus.setArrivalName(bill.getMchName()); + mchBonus.setArrivalType(BonusArrivalType.MCH.getType()); + mchBonus.setPoint(mchPoint); + mchBonus.setAmount(bill.getArrivalAmount()); + mchBonus.setRefundAmount(bill.getRefundMchAmount()); + mchBonus.setAncestors(bill.getMchId().toString()); + mchBonus.setDeptId(Constants.ROOT_DEPT); + mchBonus.setPayTime(payTime); + mchBonus.setPrePayTime(payTime); + mchBonus.setPayedAmount(bill.getArrivalAmount().subtract(bill.getRefundMchAmount())); + mchBonus.setWaitAmount(BigDecimal.ZERO); + result.add(mchBonus); return result; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java index 85c87a48..34b2392f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java @@ -1,12 +1,5 @@ package com.ruoyi.ss.bonus.service.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.domain.vo.CommonCountVO; import com.ruoyi.common.domain.vo.CommonSumVO; @@ -15,12 +8,17 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.collection.CollectionUtils; +import com.ruoyi.ss.bonus.domain.Bonus; import com.ruoyi.ss.bonus.domain.BonusProvideQuery; +import com.ruoyi.ss.bonus.domain.BonusQuery; +import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.ss.bonus.domain.enums.BonusArrivalType; import com.ruoyi.ss.bonus.domain.enums.BonusStatus; import com.ruoyi.ss.bonus.domain.vo.BonusDailyAmountVO; import com.ruoyi.ss.bonus.domain.vo.BonusMonthAmountVO; import com.ruoyi.ss.bonus.domain.vo.ProvideBonusVO; +import com.ruoyi.ss.bonus.mapper.BonusMapper; +import com.ruoyi.ss.bonus.service.BonusService; import com.ruoyi.ss.recordBalance.domain.enums.RecordBalanceBstType; import com.ruoyi.ss.store.service.StoreService; import com.ruoyi.ss.user.domain.SmUserVo; @@ -30,13 +28,15 @@ import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.bonus.mapper.BonusMapper; -import com.ruoyi.ss.bonus.domain.Bonus; -import com.ruoyi.ss.bonus.domain.BonusVO; -import com.ruoyi.ss.bonus.domain.BonusQuery; -import com.ruoyi.ss.bonus.service.BonusService; import org.springframework.transaction.support.TransactionTemplate; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + /** * 分成明细Service业务层处理 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java index b0309f2b..4efa6445 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java @@ -1,8 +1,6 @@ package com.ruoyi.ss.channel.service.impl; import com.ruoyi.common.utils.collection.CollectionUtils; -import com.ruoyi.ss.account.domain.AccountVO; -import com.ruoyi.ss.account.domain.enums.AccountType; import com.ruoyi.ss.account.service.AccountService; import com.ruoyi.ss.channel.domain.Channel; import com.ruoyi.ss.channel.domain.ChannelQuery; @@ -12,7 +10,9 @@ import com.ruoyi.ss.channel.service.ChannelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelValidatorImpl.java index 85fdce75..4e63bd51 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelValidatorImpl.java @@ -2,8 +2,8 @@ package com.ruoyi.ss.channel.service.impl; import com.ruoyi.common.core.domain.BaseValidator; import com.ruoyi.ss.channel.domain.Channel; -import com.ruoyi.ss.channel.service.ChannelValidator; import com.ruoyi.ss.channel.service.ChannelService; +import com.ruoyi.ss.channel.service.ChannelValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/ServiceIncomeQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/ServiceIncomeQuery.java index 81394efa..422aab60 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/ServiceIncomeQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/ServiceIncomeQuery.java @@ -5,7 +5,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; -import java.util.List; /** * @author wjh diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java index 5369980d..096677a9 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java @@ -3,7 +3,6 @@ package com.ruoyi.ss.device.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; import java.util.Set; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/dto/DeviceRegisterDTO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/dto/DeviceRegisterDTO.java index d0f91eec..e609b1b5 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/dto/DeviceRegisterDTO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/dto/DeviceRegisterDTO.java @@ -4,7 +4,6 @@ import com.ruoyi.common.validRule.modelExist.ModelExist; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * @author wjh 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 63dd811f..33871f94 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 @@ -4,8 +4,8 @@ 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.device.domain.DeviceView; import com.ruoyi.ss.suit.domain.SuitVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -76,9 +76,13 @@ public class DeviceVO extends Device implements IotDevice { private String modelProductId; @Override - public String getMac1() { + public String iotMac1() { return getMac(); } + @Override + public String iotMac2() { + return getMac2(); + } @Override public String getProductId() { diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceValidator.java index 64bcfea7..e05f9e2e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceValidator.java @@ -5,7 +5,6 @@ import com.ruoyi.ss.device.domain.DeviceBO; import java.util.Collection; import java.util.List; -import java.util.Set; /** * @author wjh diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceConverterImpl.java index 9643f459..402e79c4 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceConverterImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.ss.device.service.impl; import com.ruoyi.ss.device.service.DeviceConverter; -import lombok.Data; import org.springframework.stereotype.Service; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java index d4944c99..c3d5d47e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java @@ -5,7 +5,6 @@ import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.redis.RedisLock; import com.ruoyi.common.core.redis.enums.RedisLockKey; import com.ruoyi.common.enums.LoginType; -import com.ruoyi.common.enums.UserType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.*; import com.ruoyi.common.utils.collection.CollectionUtils; @@ -26,8 +25,8 @@ import com.ruoyi.ss.device.domain.vo.DeviceMacSnVO; import com.ruoyi.ss.device.domain.vo.DeviceVO; import com.ruoyi.ss.device.mapper.DeviceMapper; import com.ruoyi.ss.device.service.DeviceAssembler; -import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.device.service.DeviceService; +import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.deviceBindRecord.service.ISmDeviceBindRecordService; import com.ruoyi.ss.deviceSuit.service.DeviceSuitConverter; import com.ruoyi.ss.deviceSuit.service.DeviceSuitService; @@ -825,7 +824,7 @@ public class DeviceServiceImpl implements DeviceService String onlineStatus = iotService.getOnlineStatus(device).getStatus(); data.setOnlineStatus(onlineStatus); if (DeviceOnlineStatus.ONLINE.getStatus().equals(onlineStatus)) { - device.setLastOnlineTime(now); + data.setLastOnlineTime(now); } deviceMapper.updateSmDevice(data); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceValidatorImpl.java index 34661120..3cb7b68d 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceValidatorImpl.java @@ -2,16 +2,15 @@ package com.ruoyi.ss.device.service.impl; import com.ruoyi.common.core.domain.BaseValidator; import com.ruoyi.common.core.domain.ValidateResult; -import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.ss.device.domain.DeviceBO; import com.ruoyi.ss.device.domain.DeviceQuery; import com.ruoyi.ss.device.domain.vo.DeviceVO; -import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.device.service.DeviceService; +import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.store.service.StoreValidator; import com.ruoyi.ss.suit.service.SuitValidator; -import com.ruoyi.ss.user.service.UserValidator; import org.apache.commons.lang.StringUtils; import org.eclipse.jetty.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/domain/DeviceSuit.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/domain/DeviceSuit.java index af563058..25da4cfd 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/domain/DeviceSuit.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/domain/DeviceSuit.java @@ -1,12 +1,10 @@ package com.ruoyi.ss.deviceSuit.domain; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; /** * 设备套餐关联对象 ss_device_suit diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/mapper/DeviceSuitMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/mapper/DeviceSuitMapper.java index f01be351..ea7a635f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/mapper/DeviceSuitMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/mapper/DeviceSuitMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.deviceSuit.mapper; -import java.util.List; import com.ruoyi.ss.deviceSuit.domain.DeviceSuit; -import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery; +import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 设备套餐关联Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitConverter.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitConverter.java index 171aa21a..a0ab064f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitConverter.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitConverter.java @@ -2,7 +2,6 @@ package com.ruoyi.ss.deviceSuit.service; import com.ruoyi.ss.device.domain.DeviceBO; import com.ruoyi.ss.deviceSuit.domain.DeviceSuit; -import com.ruoyi.ss.suit.domain.Suit; import com.ruoyi.ss.suit.domain.SuitBO; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitService.java index c60423d3..df2a63da 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitService.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.deviceSuit.service; -import java.util.List; import com.ruoyi.ss.deviceSuit.domain.DeviceSuit; -import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery; +import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 设备套餐关联Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/impl/DeviceSuitServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/impl/DeviceSuitServiceImpl.java index f02add29..eb224a72 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/impl/DeviceSuitServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/impl/DeviceSuitServiceImpl.java @@ -1,17 +1,17 @@ package com.ruoyi.ss.deviceSuit.service.impl; +import com.ruoyi.common.utils.collection.CollectionUtils; +import com.ruoyi.ss.deviceSuit.domain.DeviceSuit; +import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery; +import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; +import com.ruoyi.ss.deviceSuit.mapper.DeviceSuitMapper; +import com.ruoyi.ss.deviceSuit.service.DeviceSuitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.Collections; import java.util.List; -import com.ruoyi.common.utils.collection.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.ss.deviceSuit.mapper.DeviceSuitMapper; -import com.ruoyi.ss.deviceSuit.domain.DeviceSuit; -import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; -import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery; -import com.ruoyi.ss.deviceSuit.service.DeviceSuitService; - /** * 设备套餐关联Service业务层处理 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelValidator.java index 663e3155..7e8c9d1f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelValidator.java @@ -1,8 +1,5 @@ package com.ruoyi.ss.model.service; -import com.ruoyi.common.core.domain.ValidateResult; -import com.ruoyi.ss.model.domain.SmModelBO; - import java.util.List; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java index 65d4afaf..36f63157 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java @@ -1,14 +1,14 @@ package com.ruoyi.ss.payBill.domain; -import java.math.BigDecimal; -import java.time.LocalDateTime; - +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.pay.wx.domain.Payable; import com.ruoyi.common.pay.wx.domain.enums.AttachEnums; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 支付订单对象 ss_pay_bill diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBillQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBillQuery.java index 7b9e91e2..7465cc56 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBillQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBillQuery.java @@ -3,7 +3,6 @@ package com.ruoyi.ss.payBill.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/bo/PayBillRefundBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/bo/PayBillRefundBO.java index 8ae39a5a..ce4635bf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/bo/PayBillRefundBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/bo/PayBillRefundBO.java @@ -1,6 +1,5 @@ package com.ruoyi.ss.payBill.domain.bo; -import com.ruoyi.ss.payBill.domain.PayBill; import com.ruoyi.ss.payBill.domain.PayBillVO; import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO; import lombok.Data; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/enums/PayBillBstType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/enums/PayBillBstType.java index d3a1a970..da6b782f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/enums/PayBillBstType.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/enums/PayBillBstType.java @@ -3,8 +3,8 @@ package com.ruoyi.ss.payBill.domain.enums; import com.ruoyi.ss.payBill.interfaces.AfterPay; import com.ruoyi.ss.payBill.interfaces.AfterRefund; import com.ruoyi.ss.timeBill.service.impl.TimeBillServiceImpl; -import com.ruoyi.ss.transactionBill.service.impl.RechargePayHandler; import com.ruoyi.ss.transactionBill.service.impl.RechargeDepositAfterPay; +import com.ruoyi.ss.transactionBill.service.impl.RechargePayHandler; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java index 23eda5ac..4c0ba039 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.payBill.mapper; +import com.ruoyi.ss.payBill.domain.PayBill; +import com.ruoyi.ss.payBill.domain.PayBillQuery; +import com.ruoyi.ss.payBill.domain.PayBillVO; +import org.apache.ibatis.annotations.Param; + import java.math.BigDecimal; import java.util.List; -import com.ruoyi.ss.payBill.domain.PayBill; -import com.ruoyi.ss.payBill.domain.PayBillVO; -import com.ruoyi.ss.payBill.domain.PayBillQuery; -import org.apache.ibatis.annotations.Param; /** * 支付订单Mapper接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/PayBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/PayBillService.java index 16ec9053..00237071 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/PayBillService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/PayBillService.java @@ -1,16 +1,16 @@ package com.ruoyi.ss.payBill.service; +import com.ruoyi.ss.payBill.domain.PayBill; +import com.ruoyi.ss.payBill.domain.PayBillQuery; +import com.ruoyi.ss.payBill.domain.PayBillVO; +import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO; +import com.ruoyi.ss.payBill.domain.vo.DoPayVO; +import com.ruoyi.ss.refund.domain.RefundVO; + import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.TimeUnit; -import com.ruoyi.ss.payBill.domain.PayBill; -import com.ruoyi.ss.payBill.domain.PayBillVO; -import com.ruoyi.ss.payBill.domain.PayBillQuery; -import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO; -import com.ruoyi.ss.payBill.domain.vo.DoPayVO; -import com.ruoyi.ss.refund.domain.RefundVO; - /** * 支付订单Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/domain/RealName.java b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/domain/RealName.java index 3237e621..0fbf75f5 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/domain/RealName.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/domain/RealName.java @@ -1,15 +1,13 @@ package com.ruoyi.ss.realName.domain; -import java.math.BigDecimal; - +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.enums.DesensitizedType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; + +import java.math.BigDecimal; /** * 实名认证对象 ss_real_name diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/mapper/RealNameMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/mapper/RealNameMapper.java index 1845ca1d..615fde69 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/mapper/RealNameMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/mapper/RealNameMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.realName.mapper; -import java.util.List; import com.ruoyi.ss.realName.domain.RealName; -import com.ruoyi.ss.realName.domain.RealNameVO; import com.ruoyi.ss.realName.domain.RealNameQuery; +import com.ruoyi.ss.realName.domain.RealNameVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 实名认证Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/IRealNameService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/IRealNameService.java index 2759f57a..a7f71109 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/IRealNameService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/IRealNameService.java @@ -1,9 +1,10 @@ package com.ruoyi.ss.realName.service; -import java.util.List; import com.ruoyi.ss.realName.domain.RealName; -import com.ruoyi.ss.realName.domain.RealNameVO; import com.ruoyi.ss.realName.domain.RealNameQuery; +import com.ruoyi.ss.realName.domain.RealNameVO; + +import java.util.List; /** * 实名认证Service接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/impl/RealNameServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/impl/RealNameServiceImpl.java index 594ba272..f5057d97 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/impl/RealNameServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/impl/RealNameServiceImpl.java @@ -1,14 +1,15 @@ package com.ruoyi.ss.realName.service.impl; -import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.ss.realName.domain.RealName; +import com.ruoyi.ss.realName.domain.RealNameQuery; +import com.ruoyi.ss.realName.domain.RealNameVO; +import com.ruoyi.ss.realName.mapper.RealNameMapper; +import com.ruoyi.ss.realName.service.IRealNameService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.realName.mapper.RealNameMapper; -import com.ruoyi.ss.realName.domain.RealName; -import com.ruoyi.ss.realName.domain.RealNameVO; -import com.ruoyi.ss.realName.domain.RealNameQuery; -import com.ruoyi.ss.realName.service.IRealNameService; + +import java.util.List; /** * 实名认证Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java index 5cba22e0..12f3790f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java @@ -1,17 +1,14 @@ package com.ruoyi.ss.receiveBill.domain; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonView; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.JsonViewProfile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 应收账单对象 ss_receive_bill diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.java index 7bfa1399..dcde393e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.java @@ -1,12 +1,13 @@ package com.ruoyi.ss.receiveBill.mapper; +import com.ruoyi.ss.receiveBill.domain.ReceiveBill; +import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery; +import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO; +import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO; +import org.apache.ibatis.annotations.Param; + import java.math.BigDecimal; import java.util.List; -import com.ruoyi.ss.receiveBill.domain.ReceiveBill; -import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO; -import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery; -import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO; -import org.apache.ibatis.annotations.Param; /** * 应收账单Mapper接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/ReceiveBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/ReceiveBillService.java index 7d841635..11cb882c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/ReceiveBillService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/ReceiveBillService.java @@ -1,15 +1,15 @@ package com.ruoyi.ss.receiveBill.service; -import java.math.BigDecimal; -import java.util.List; - import com.ruoyi.ss.device.domain.vo.DeviceVO; import com.ruoyi.ss.receiveBill.domain.ReceiveBill; -import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO; import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery; +import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO; import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO; import com.ruoyi.ss.user.domain.SmUserVo; +import java.math.BigDecimal; +import java.util.List; + /** * 应收账单Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/impl/ReceiveBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/impl/ReceiveBillServiceImpl.java index f57a1b80..bc080310 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/impl/ReceiveBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/impl/ReceiveBillServiceImpl.java @@ -1,30 +1,30 @@ package com.ruoyi.ss.receiveBill.service.impl; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.concurrent.TimeUnit; - import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.ss.device.domain.vo.DeviceVO; import com.ruoyi.ss.device.service.DeviceService; +import com.ruoyi.ss.receiveBill.domain.ReceiveBill; +import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery; +import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO; import com.ruoyi.ss.receiveBill.domain.enums.ReceiveBillStatus; import com.ruoyi.ss.receiveBill.domain.enums.ReceiveBillType; import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO; +import com.ruoyi.ss.receiveBill.mapper.ReceiveBillMapper; +import com.ruoyi.ss.receiveBill.service.ReceiveBillService; import com.ruoyi.ss.recordBalance.domain.enums.RecordBalanceBstType; import com.ruoyi.ss.transactionBill.service.impl.TransactionBillServiceImpl; import com.ruoyi.ss.user.domain.SmUserVo; import com.ruoyi.ss.user.service.ISmUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.receiveBill.mapper.ReceiveBillMapper; -import com.ruoyi.ss.receiveBill.domain.ReceiveBill; -import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO; -import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery; -import com.ruoyi.ss.receiveBill.service.ReceiveBillService; import org.springframework.transaction.support.TransactionTemplate; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; +import java.util.concurrent.TimeUnit; + /** * 应收账单Service业务层处理 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTime.java b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTime.java index ab4ff58a..1d395476 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTime.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTime.java @@ -1,15 +1,12 @@ package com.ruoyi.ss.record.time.domain; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; /** * 设备时长变化记录对象 ss_record_time diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTimeVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTimeVO.java index 78bc6445..ec15c3b2 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTimeVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTimeVO.java @@ -1,6 +1,5 @@ package com.ruoyi.ss.record.time.domain; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/mapper/RecordTimeMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/mapper/RecordTimeMapper.java index df8a5461..5031e2dd 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/mapper/RecordTimeMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/mapper/RecordTimeMapper.java @@ -1,10 +1,11 @@ package com.ruoyi.ss.record.time.mapper; -import java.util.List; import com.ruoyi.ss.record.time.domain.RecordTime; import com.ruoyi.ss.record.time.domain.RecordTimeQuery; import com.ruoyi.ss.record.time.domain.RecordTimeVO; +import java.util.List; + /** * 设备时长变化记录Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/IRecordTimeService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/IRecordTimeService.java index 24e5c089..7cc8384c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/IRecordTimeService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/IRecordTimeService.java @@ -1,10 +1,11 @@ package com.ruoyi.ss.record.time.service; -import java.util.List; import com.ruoyi.ss.record.time.domain.RecordTime; import com.ruoyi.ss.record.time.domain.RecordTimeQuery; import com.ruoyi.ss.record.time.domain.RecordTimeVO; +import java.util.List; + /** * 设备时长变化记录Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/impl/RecordTimeServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/impl/RecordTimeServiceImpl.java index 5ed753e4..9224200c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/impl/RecordTimeServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/impl/RecordTimeServiceImpl.java @@ -1,14 +1,14 @@ package com.ruoyi.ss.record.time.service.impl; -import java.util.List; - +import com.ruoyi.ss.record.time.domain.RecordTime; import com.ruoyi.ss.record.time.domain.RecordTimeQuery; import com.ruoyi.ss.record.time.domain.RecordTimeVO; +import com.ruoyi.ss.record.time.mapper.RecordTimeMapper; +import com.ruoyi.ss.record.time.service.IRecordTimeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.record.time.mapper.RecordTimeMapper; -import com.ruoyi.ss.record.time.domain.RecordTime; -import com.ruoyi.ss.record.time.service.IRecordTimeService; + +import java.util.List; /** * 设备时长变化记录Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/recordBalance/domain/RecordBalance.java b/smart-switch-service/src/main/java/com/ruoyi/ss/recordBalance/domain/RecordBalance.java index 84489c5d..3da78ed8 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/recordBalance/domain/RecordBalance.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/recordBalance/domain/RecordBalance.java @@ -1,13 +1,11 @@ package com.ruoyi.ss.recordBalance.domain; -import java.math.BigDecimal; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; /** * 余额变动记录对象 ss_record_balance diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/Refund.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/Refund.java index 91f0e417..071e82b7 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/Refund.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/Refund.java @@ -1,11 +1,11 @@ package com.ruoyi.ss.refund.domain; -import java.math.BigDecimal; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; /** * 退款订单对象 ss_refund diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.java index 493332c4..5ea74393 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.refund.mapper; -import java.util.List; import com.ruoyi.ss.refund.domain.Refund; import com.ruoyi.ss.refund.domain.RefundQuery; import com.ruoyi.ss.refund.domain.RefundVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 退款订单Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundConverter.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundConverter.java index 4438c07a..8ad22cc3 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundConverter.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundConverter.java @@ -2,7 +2,6 @@ package com.ruoyi.ss.refund.service; import com.ruoyi.ss.payBill.domain.bo.PayBillRefundBO; import com.ruoyi.ss.refund.domain.Refund; -import com.ruoyi.ss.transactionBill.domain.dto.BillRefundDTO; /** * @author wjh diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundService.java index 3cef1cd8..a2226248 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundService.java @@ -1,10 +1,11 @@ package com.ruoyi.ss.refund.service; -import java.util.List; import com.ruoyi.ss.refund.domain.Refund; import com.ruoyi.ss.refund.domain.RefundQuery; import com.ruoyi.ss.refund.domain.RefundVO; +import java.util.List; + /** * 退款订单Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java index e738da96..74425daa 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java @@ -2,7 +2,6 @@ package com.ruoyi.ss.refund.service.impl; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.ss.payBill.domain.PayBillVO; import com.ruoyi.ss.payBill.domain.bo.PayBillRefundBO; import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO; @@ -10,18 +9,12 @@ import com.ruoyi.ss.refund.domain.Refund; import com.ruoyi.ss.refund.domain.enums.RefundBstType; import com.ruoyi.ss.refund.domain.enums.RefundStatus; import com.ruoyi.ss.refund.service.RefundConverter; -import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO; -import com.ruoyi.ss.transactionBill.domain.dto.BillRefundDTO; import com.ruoyi.ss.transactionBill.service.TransactionBillService; import lombok.extern.slf4j.Slf4j; -import lombok.extern.slf4j.XSlf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.math.RoundingMode; - /** * @author wjh * 2024/7/9 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundServiceImpl.java index 88f22fdc..babba0be 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundServiceImpl.java @@ -1,10 +1,5 @@ package com.ruoyi.ss.refund.service.impl; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.pay.syb.enums.SybTrxStatus; import com.ruoyi.common.pay.syb.service.SybPayService; @@ -13,24 +8,24 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.SnowFlakeUtil; import com.ruoyi.ss.payBill.service.PayBillService; +import com.ruoyi.ss.refund.domain.Refund; import com.ruoyi.ss.refund.domain.RefundQuery; import com.ruoyi.ss.refund.domain.RefundVO; import com.ruoyi.ss.refund.domain.enums.RefundStatus; -import com.ruoyi.ss.transactionBill.domain.TransactionBill; -import com.ruoyi.ss.transactionBill.domain.TransactionBillQuery; +import com.ruoyi.ss.refund.mapper.RefundMapper; +import com.ruoyi.ss.refund.service.RefundService; import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillPayType; -import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO; -import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; import com.ruoyi.ss.transactionBill.service.TransactionBillService; -import com.ruoyi.ss.user.service.ISmUserService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.refund.mapper.RefundMapper; -import com.ruoyi.ss.refund.domain.Refund; -import com.ruoyi.ss.refund.service.RefundService; import org.springframework.transaction.support.TransactionTemplate; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + /** * 退款订单Service业务层处理 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/domain/enums/StoreStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/domain/enums/StoreStatus.java index e666885c..87f82a49 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/domain/enums/StoreStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/domain/enums/StoreStatus.java @@ -1,7 +1,6 @@ package com.ruoyi.ss.store.domain.enums; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.Getter; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java index 05e6893f..16838a48 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java @@ -2,7 +2,6 @@ package com.ruoyi.ss.store.service; import com.ruoyi.common.core.domain.ValidateResult; import com.ruoyi.ss.store.domain.Store; -import com.ruoyi.ss.store.domain.StoreVo; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java index f243b96e..3084be1f 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.ss.store.service.impl; -import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.ss.dashboard.vo.BillCountVo; import com.ruoyi.ss.device.domain.DeviceCountVO; import com.ruoyi.ss.device.domain.DeviceQuery; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java index 1653a57d..f7ecb703 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java @@ -1,17 +1,17 @@ package com.ruoyi.ss.store.service.impl; -import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; +import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.ss.device.domain.DeviceQuery; import com.ruoyi.ss.device.service.DeviceService; import com.ruoyi.ss.store.domain.*; import com.ruoyi.ss.store.domain.enums.StoreGroupBy; import com.ruoyi.ss.store.domain.enums.StoreStatus; import com.ruoyi.ss.store.mapper.StoreMapper; -import com.ruoyi.ss.store.service.StoreService; import com.ruoyi.ss.store.service.StoreAssembler; +import com.ruoyi.ss.store.service.StoreService; import com.ruoyi.ss.storeApply.domain.enums.StoreApplyType; import com.ruoyi.ss.storeApply.service.StoreApplyConverter; import com.ruoyi.ss.storeApply.service.StoreApplyService; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java index 41ec7739..a59dad0c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java @@ -2,9 +2,8 @@ package com.ruoyi.ss.store.service.impl; import com.ruoyi.common.core.domain.BaseValidator; import com.ruoyi.common.core.domain.ValidateResult; -import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.ss.device.domain.DeviceQuery; import com.ruoyi.ss.device.service.DeviceService; import com.ruoyi.ss.store.domain.Store; @@ -21,7 +20,6 @@ import java.time.LocalTime; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/StoreApply.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/StoreApply.java index 3cd047f9..d2b79659 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/StoreApply.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/StoreApply.java @@ -1,14 +1,12 @@ package com.ruoyi.ss.storeApply.domain; import com.fasterxml.jackson.annotation.JsonView; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.JsonViewProfile; import com.ruoyi.ss.store.domain.Store; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import java.time.LocalDateTime; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/bo/StoreApplyApprovalBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/bo/StoreApplyApprovalBO.java index c6cfb3ff..579a0264 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/bo/StoreApplyApprovalBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/bo/StoreApplyApprovalBO.java @@ -2,7 +2,6 @@ package com.ruoyi.ss.storeApply.domain.bo; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.ss.store.domain.StoreVo; -import com.ruoyi.ss.storeApply.domain.StoreApply; import com.ruoyi.ss.storeApply.domain.StoreApplyVO; import com.ruoyi.ss.storeApply.domain.dto.StoreApplyApprovalDTO; import lombok.Data; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.java index 3f20cb48..bf152d07 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.storeApply.mapper; -import java.util.List; import com.ruoyi.ss.storeApply.domain.StoreApply; -import com.ruoyi.ss.storeApply.domain.StoreApplyVO; import com.ruoyi.ss.storeApply.domain.StoreApplyQuery; +import com.ruoyi.ss.storeApply.domain.StoreApplyVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 店铺审核Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/StoreApplyService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/StoreApplyService.java index a66ce4d4..fd741fba 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/StoreApplyService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/StoreApplyService.java @@ -1,13 +1,12 @@ package com.ruoyi.ss.storeApply.service; -import java.util.List; - -import com.ruoyi.ss.store.domain.StoreBO; import com.ruoyi.ss.storeApply.domain.StoreApply; -import com.ruoyi.ss.storeApply.domain.StoreApplyVO; import com.ruoyi.ss.storeApply.domain.StoreApplyQuery; +import com.ruoyi.ss.storeApply.domain.StoreApplyVO; import com.ruoyi.ss.storeApply.domain.bo.StoreApplyApprovalBO; +import java.util.List; + /** * 店铺审核Service接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java index 292db88b..3797332c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java @@ -1,29 +1,26 @@ package com.ruoyi.ss.storeApply.service.impl; -import java.time.LocalDateTime; -import java.util.List; - -import com.github.pagehelper.PageHelper; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.ss.store.domain.Store; -import com.ruoyi.ss.store.domain.StoreBO; import com.ruoyi.ss.store.domain.StoreQuery; import com.ruoyi.ss.store.domain.enums.StoreStatus; import com.ruoyi.ss.store.service.StoreService; +import com.ruoyi.ss.storeApply.domain.StoreApply; +import com.ruoyi.ss.storeApply.domain.StoreApplyQuery; +import com.ruoyi.ss.storeApply.domain.StoreApplyVO; import com.ruoyi.ss.storeApply.domain.bo.StoreApplyApprovalBO; import com.ruoyi.ss.storeApply.domain.dto.StoreApplyApprovalDTO; import com.ruoyi.ss.storeApply.domain.enums.StoreApplyStatus; +import com.ruoyi.ss.storeApply.mapper.StoreApplyMapper; +import com.ruoyi.ss.storeApply.service.StoreApplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.storeApply.mapper.StoreApplyMapper; -import com.ruoyi.ss.storeApply.domain.StoreApply; -import com.ruoyi.ss.storeApply.domain.StoreApplyVO; -import com.ruoyi.ss.storeApply.domain.StoreApplyQuery; -import com.ruoyi.ss.storeApply.service.StoreApplyService; import org.springframework.transaction.support.TransactionTemplate; -import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.List; /** * 店铺审核Service业务层处理 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/domain/Suit.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/domain/Suit.java index 550f34f0..807c3bfb 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/domain/Suit.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/domain/Suit.java @@ -8,12 +8,15 @@ import com.ruoyi.common.core.domain.JsonViewProfile; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.validRule.allowSize.AllowSize; import com.ruoyi.common.validRule.suitExist.SuitExist; -import com.ruoyi.system.valid.DictValid; import com.ruoyi.ss.device.domain.DeviceView; +import com.ruoyi.system.valid.DictValid; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.*; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.math.BigDecimal; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/SuitConverter.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/SuitConverter.java index 5949c2e9..9f01d429 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/SuitConverter.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/SuitConverter.java @@ -1,10 +1,5 @@ package com.ruoyi.ss.suit.service; -import com.ruoyi.ss.suit.domain.Suit; -import com.ruoyi.ss.suit.domain.dto.SuitCopyDTO; - -import java.util.List; - /** * @author wjh * 2024/7/15 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitAssemblerImpl.java index 3b095525..fafdd094 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitAssemblerImpl.java @@ -1,18 +1,18 @@ package com.ruoyi.ss.suit.service.impl; import com.ruoyi.common.utils.collection.CollectionUtils; -import com.ruoyi.ss.device.domain.vo.DeviceVO; -import com.ruoyi.ss.device.service.DeviceService; import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery; import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; import com.ruoyi.ss.deviceSuit.service.DeviceSuitService; import com.ruoyi.ss.suit.domain.SuitVO; import com.ruoyi.ss.suit.service.SuitAssembler; -import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitConverterImpl.java index c3b08b41..9064a461 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitConverterImpl.java @@ -1,19 +1,10 @@ package com.ruoyi.ss.suit.service.impl; -import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.common.utils.collection.CollectionUtils; -import com.ruoyi.ss.suit.domain.Suit; -import com.ruoyi.ss.suit.domain.SuitQuery; -import com.ruoyi.ss.suit.domain.SuitVO; -import com.ruoyi.ss.suit.domain.dto.SuitCopyDTO; import com.ruoyi.ss.suit.service.SuitConverter; import com.ruoyi.ss.suit.service.SuitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; - /** * @author wjh * 2024/7/15 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitServiceImpl.java index 9fdeb5cd..59cb27b5 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitServiceImpl.java @@ -1,8 +1,8 @@ package com.ruoyi.ss.suit.service.impl; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.collection.CollectionUtils; -import com.ruoyi.common.utils.DateUtils; import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery; import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO; import com.ruoyi.ss.deviceSuit.service.DeviceSuitConverter; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitValidatorImpl.java index 9e39f026..ac5e85df 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitValidatorImpl.java @@ -2,9 +2,9 @@ package com.ruoyi.ss.suit.service.impl; import com.ruoyi.common.core.domain.BaseValidator; import com.ruoyi.common.core.domain.ValidateResult; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.collection.CollectionUtils; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.ss.device.service.DeviceValidator; import com.ruoyi.ss.suit.domain.SuitBO; @@ -20,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * 2024/4/26 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/TimeBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/TimeBill.java index 95abd054..cb13c856 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/TimeBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/TimeBill.java @@ -1,15 +1,12 @@ package com.ruoyi.ss.timeBill.domain; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; /** * 时长订单对象 ss_time_bill diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/dto/TimeBillAddOrderDTO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/dto/TimeBillAddOrderDTO.java index 7732c837..6cad7d80 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/dto/TimeBillAddOrderDTO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/dto/TimeBillAddOrderDTO.java @@ -1,13 +1,11 @@ package com.ruoyi.ss.timeBill.domain.dto; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.constants.DictTypeConstants; import com.ruoyi.ss.device.domain.vo.DeviceVO; import com.ruoyi.system.valid.DictValid; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/mapper/TimeBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/mapper/TimeBillMapper.java index b500a1f4..1671b105 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/mapper/TimeBillMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/mapper/TimeBillMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.timeBill.mapper; -import java.util.List; import com.ruoyi.ss.timeBill.domain.TimeBill; -import com.ruoyi.ss.timeBill.domain.TimeBillVO; import com.ruoyi.ss.timeBill.domain.TimeBillQuery; +import com.ruoyi.ss.timeBill.domain.TimeBillVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 时长订单Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/TimeBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/TimeBillService.java index 5081be45..337abb24 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/TimeBillService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/TimeBillService.java @@ -1,15 +1,14 @@ package com.ruoyi.ss.timeBill.service; -import java.util.List; - -import com.ruoyi.ss.payBill.domain.PayBillVO; import com.ruoyi.ss.payBill.domain.vo.DoPayVO; import com.ruoyi.ss.timeBill.domain.TimeBill; -import com.ruoyi.ss.timeBill.domain.TimeBillVO; import com.ruoyi.ss.timeBill.domain.TimeBillQuery; +import com.ruoyi.ss.timeBill.domain.TimeBillVO; import com.ruoyi.ss.timeBill.domain.dto.TimeBillAddOrderDTO; import com.ruoyi.ss.timeBill.domain.dto.TimeBillPayDTO; +import java.util.List; + /** * 时长订单Service接口 * 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 56f48d2c..0f15c124 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 @@ -1,12 +1,8 @@ package com.ruoyi.ss.timeBill.service.impl; -import java.math.BigDecimal; -import java.time.Duration; -import java.time.LocalDateTime; -import java.util.List; - import com.ruoyi.common.core.redis.RedisLock; import com.ruoyi.common.core.redis.enums.RedisLockKey; +import com.ruoyi.common.pay.wx.service.WxPayService; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.SnowFlakeUtil; @@ -20,20 +16,24 @@ import com.ruoyi.ss.payBill.interfaces.AfterPay; import com.ruoyi.ss.payBill.service.PayBillConverter; import com.ruoyi.ss.payBill.service.PayBillService; import com.ruoyi.ss.suit.domain.enums.SuitTimeUnit; +import com.ruoyi.ss.timeBill.domain.TimeBill; +import com.ruoyi.ss.timeBill.domain.TimeBillQuery; +import com.ruoyi.ss.timeBill.domain.TimeBillVO; import com.ruoyi.ss.timeBill.domain.dto.TimeBillAddOrderDTO; import com.ruoyi.ss.timeBill.domain.dto.TimeBillPayDTO; import com.ruoyi.ss.timeBill.domain.enums.TimeBillStatus; +import com.ruoyi.ss.timeBill.mapper.TimeBillMapper; import com.ruoyi.ss.timeBill.service.TimeBillConverter; -import com.ruoyi.common.pay.wx.service.WxPayService; +import com.ruoyi.ss.timeBill.service.TimeBillService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.timeBill.mapper.TimeBillMapper; -import com.ruoyi.ss.timeBill.domain.TimeBill; -import com.ruoyi.ss.timeBill.domain.TimeBillVO; -import com.ruoyi.ss.timeBill.domain.TimeBillQuery; -import com.ruoyi.ss.timeBill.service.TimeBillService; import org.springframework.transaction.support.TransactionTemplate; +import java.math.BigDecimal; +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.List; + /** * 时长订单Service业务层处理 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillValidatorImpl.java index 89d77fb6..731a699b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillValidatorImpl.java @@ -6,7 +6,6 @@ import com.ruoyi.ss.device.domain.vo.DeviceVO; import com.ruoyi.ss.timeBill.domain.TimeBillVO; import com.ruoyi.ss.timeBill.domain.dto.TimeBillAddOrderDTO; import com.ruoyi.ss.timeBill.service.TimeBillValidator; -import lombok.Data; import org.springframework.stereotype.Service; import java.util.Objects; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java index 843d4cd0..c98de7b2 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java @@ -1,5 +1,6 @@ package com.ruoyi.ss.transactionBill.domain.enums; +import com.ruoyi.common.enums.UserType; import lombok.AllArgsConstructor; import lombok.Getter; @@ -85,4 +86,5 @@ public enum TransactionBillStatus { public static List serviceIncome() { return asList(SUCCESS, REFUNDED, REFUNDING, WITHDRAW_SUCCESS); } + } 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 9fadafec..fbad80ca 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 @@ -73,12 +73,12 @@ public class TransactionBillVO extends TransactionBill implements IotDevice { } @Override - public String getMac1() { + public String iotMac1() { return getDeviceMac(); } @Override - public String getMac2() { + public String iotMac2() { return getDeviceMac2(); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java index 8aae1913..7709f217 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java @@ -318,4 +318,11 @@ public interface TransactionBillService * 修复订单数据 */ int fix(Long billId); + + /** + * 修复所有订单数据 + * @return + */ + int fixAll(); + } 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 dcd50209..5f2b5745 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 @@ -372,11 +372,34 @@ public class TransactionBillServiceImpl implements TransactionBillService, After return fix(bill); } + @Override + public int fixAll() { + TransactionBillQuery query = new TransactionBillQuery(); + query.setStatusList(TransactionBillStatus.payedOrder()); + query.setVersion(1); + List list = selectSmTransactionBillList(query); + if (CollectionUtils.isEmptyElement(list)) { + return 0; + } + + for (TransactionBillVO bill : list) { + try { + this.fix(bill); + } catch (Exception e) { + log.error("修复订单数据失败：{}, {}", bill.getBillNo(), e.getMessage()); + } + } + + return 1; + } + private int fix(TransactionBillVO bill) { if (bill == null || bill.getBillId() == null) { log.warn("修复订单数据失败：订单不存在或订单ID为空"); return 0; } + // 仅可以修复旧订单 + ServiceUtil.assertion(bill.getVersion() == null || bill.getVersion() != 1, "该订单版本无法修复"); ServiceUtil.assertion(!TransactionBillStatus.payedOrder().contains(bill.getStatus()), "订单未支付，无法修复"); // 获取订单分成数据，判断是否已有分成数据 @@ -385,9 +408,18 @@ public class TransactionBillServiceImpl implements TransactionBillService, After int bonusCount = bonusService.selectCount(query); ServiceUtil.assertion(bonusCount > 0, "订单已存在分成数据，无法重复修复"); - // TODO 根据订单生成新的分成数据 - bonusConverter.toPo(bill); + // 根据订单生成新的分成数据 + List bonusList = bonusConverter.toPo(bill); + ServiceUtil.assertion(CollectionUtils.isEmptyElement(bonusList), "订单生成分成数据失败"); + // 插入数据 + Integer result = transactionTemplate.execute(status -> { + int insert = bonusService.batchInsert(bonusList); + ServiceUtil.assertion(insert != bonusList.size(), "订单分成数据插入失败"); + return insert; + }); + + return result == null ? 0 : result; } // 转换为订单所需的数据 @@ -408,6 +440,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After // 基础信息 order.setType(TransactionBillType.RECHARGE.getType()); // 类型：充值订单 order.setDeviceRechargeStatus(TransactionBillDeviceRechargeStatus.UN_RECHARGE.getStatus()); // 设备状态：未充值 + order.setVersion(2); // 订单版本 if (SuitFeeType.timingList().contains(suit.getFeeType())) { // 当为分时段收费，则收取押金 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/domain/Transfer.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/domain/Transfer.java index 27bf7b74..8f22c109 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/domain/Transfer.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/domain/Transfer.java @@ -1,11 +1,9 @@ package com.ruoyi.ss.transfer.domain; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/mapper/TransferMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/mapper/TransferMapper.java index a2206f2a..fc907b37 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/mapper/TransferMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/mapper/TransferMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.ss.transfer.mapper; -import java.util.List; import com.ruoyi.ss.transfer.domain.Transfer; -import com.ruoyi.ss.transfer.domain.TransferVO; import com.ruoyi.ss.transfer.domain.TransferQuery; +import com.ruoyi.ss.transfer.domain.TransferVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 转账Mapper接口 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/TransferService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/TransferService.java index 35fe9fe6..1827d286 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/TransferService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/TransferService.java @@ -1,9 +1,10 @@ package com.ruoyi.ss.transfer.service; -import java.util.List; import com.ruoyi.ss.transfer.domain.Transfer; -import com.ruoyi.ss.transfer.domain.TransferVO; import com.ruoyi.ss.transfer.domain.TransferQuery; +import com.ruoyi.ss.transfer.domain.TransferVO; + +import java.util.List; /** * 转账Service接口 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferAssemblerImpl.java index 10ebe62e..30fd578b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferAssemblerImpl.java @@ -6,7 +6,6 @@ import com.ruoyi.ss.transfer.service.TransferAssembler; import com.ruoyi.ss.transferDetail.domain.TransferDetailQuery; import com.ruoyi.ss.transferDetail.domain.TransferDetailVO; import com.ruoyi.ss.transferDetail.service.ITransferDetailService; -import com.ruoyi.ss.transferDetail.service.impl.TransferDetailServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferConverterImpl.java index 840ebfcb..34c2596c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferConverterImpl.java @@ -4,12 +4,10 @@ import com.ruoyi.ss.account.domain.enums.AccountType; import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO; import com.ruoyi.ss.channelWithdraw.service.ChannelWithdrawService; import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO; -import com.ruoyi.ss.transfer.domain.Transfer; import com.ruoyi.ss.transfer.domain.TransferVO; import com.ruoyi.ss.transfer.domain.enums.TransferBstType; import com.ruoyi.ss.transfer.domain.enums.TransferStatus; import com.ruoyi.ss.transfer.service.TransferConverter; -import com.ruoyi.ss.transferDetail.domain.TransferDetail; import com.ruoyi.ss.transferDetail.domain.TransferDetailVO; import com.ruoyi.ss.transferDetail.domain.enums.TransferDetailStatus; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferServiceImpl.java index 81a128f4..8dc28a19 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transfer/service/impl/TransferServiceImpl.java @@ -1,10 +1,5 @@ package com.ruoyi.ss.transfer.service.impl; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.pay.wx.domain.enums.WxTransferBatchStatus; import com.ruoyi.common.pay.wx.domain.enums.WxTransferDetailStatus; @@ -17,10 +12,15 @@ import com.ruoyi.common.utils.SnowFlakeUtil; import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.ss.account.domain.enums.AccountType; +import com.ruoyi.ss.transfer.domain.Transfer; +import com.ruoyi.ss.transfer.domain.TransferQuery; +import com.ruoyi.ss.transfer.domain.TransferVO; import com.ruoyi.ss.transfer.domain.enums.TransferBstType; import com.ruoyi.ss.transfer.domain.enums.TransferStatus; import com.ruoyi.ss.transfer.interfaces.AfterTransfer; +import com.ruoyi.ss.transfer.mapper.TransferMapper; import com.ruoyi.ss.transfer.service.TransferAssembler; +import com.ruoyi.ss.transfer.service.TransferService; import com.ruoyi.ss.transferDetail.domain.TransferDetail; import com.ruoyi.ss.transferDetail.domain.TransferDetailQuery; import com.ruoyi.ss.transferDetail.domain.TransferDetailVO; @@ -28,16 +28,15 @@ import com.ruoyi.ss.transferDetail.domain.enums.TransferDetailStatus; import com.ruoyi.ss.transferDetail.service.ITransferDetailService; import com.wechat.pay.java.service.transferbatch.model.*; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.ss.transfer.mapper.TransferMapper; -import com.ruoyi.ss.transfer.domain.Transfer; -import com.ruoyi.ss.transfer.domain.TransferVO; -import com.ruoyi.ss.transfer.domain.TransferQuery; -import com.ruoyi.ss.transfer.service.TransferService; import org.springframework.transaction.support.TransactionTemplate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + /** * 转账Service业务层处理 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java index f650af71..deb1c806 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java @@ -7,12 +7,10 @@ import com.ruoyi.ss.user.domain.SmUserQuery; import com.ruoyi.ss.user.domain.SmUserVo; import com.ruoyi.ss.user.domain.dto.UserRealNameDTO; import com.ruoyi.ss.user.domain.vo.UserRealNameVO; -import nonapi.io.github.classgraph.utils.LogNode; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import java.util.stream.Stream; /** * 普通用户信息Service接口 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 fa06e84c..769cf07f 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 @@ -43,7 +43,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; -import org.springframework.util.Base64Utils; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java index 65baff10..ffbc8248 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java @@ -14,7 +14,6 @@ import com.ruoyi.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceStatusTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceStatusTask.java index f0e1e973..a2603734 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceStatusTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceStatusTask.java @@ -1,9 +1,5 @@ package com.ruoyi.task.device; -import com.ruoyi.common.utils.collection.CollectionUtils; -import com.ruoyi.ss.device.domain.DeviceQuery; -import com.ruoyi.ss.device.domain.enums.DeviceStatus; -import com.ruoyi.ss.device.domain.vo.DeviceVO; import com.ruoyi.ss.device.service.DeviceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,8 +7,6 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; -import java.util.List; - /** * @author wjh * 2024/5/20 diff --git a/smart-switch-service/src/main/java/com/ruoyi/task/refund/RefundTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/refund/RefundTask.java index be2d4b9b..d857031a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/task/refund/RefundTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/refund/RefundTask.java @@ -8,7 +8,6 @@ import com.ruoyi.ss.refund.service.RefundService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/task/transfer/TransferTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/transfer/TransferTask.java index 73a411ae..2e36a52a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/task/transfer/TransferTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/transfer/TransferTask.java @@ -5,7 +5,6 @@ import com.ruoyi.ss.transfer.domain.TransferVO; import com.ruoyi.ss.transfer.domain.enums.TransferStatus; import com.ruoyi.ss.transfer.service.TransferAssembler; import com.ruoyi.ss.transfer.service.TransferService; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; 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 9f4396ff..5df84b45 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 @@ -174,7 +174,6 @@ public class AppDeviceController extends BaseController { @ApiOperation("刷新设备信息") @GetMapping("/{deviceId}/refreshIot") public AjaxResult syncIot(@PathVariable @ApiParam("设备id") Long deviceId) { - ServiceUtil.assertion(!deviceValidator.isBelong(deviceId, getUserId()), "这不是您的设备"); smDeviceService.pullDeviceInfo(Collections.singletonList(deviceId)); return success(); } @@ -230,6 +229,13 @@ public class AppDeviceController extends BaseController { return success(smDeviceService.selectMacSnList(query)); } + @ApiOperation("管理员开关设备") + @DeviceAdminRequired + @PutMapping("/admin/{deviceId}/switch") + public AjaxResult getExistMac(@PathVariable @ApiParam("设备ID") Long deviceId, @RequestParam @ApiParam("是否开启") Boolean open) { + return toAjax(smDeviceService.switchDevice(deviceId, open)); + } + @ApiOperation("获取正在使用中的设备列表") @GetMapping("/usingDevice") @JsonView(JsonViewProfile.App.class) diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java index 9dc0dc8b..e699c99b 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java @@ -200,5 +200,11 @@ public class SmTransactionBillController extends BaseController return toAjax(transactionBillService.fix(billId)); } + @PutMapping("/fixAll") + @Log(title = "修复所有订单数据", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('system:bill:fix')") + public AjaxResult fixAll() { + return toAjax(transactionBillService.fixAll()); + } }