From c2c38dfbb663426f822c2e3ce17c5317901f8ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Fri, 7 Feb 2025 13:35:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java | 1 + 1 file changed, 1 insertion(+) 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 e41387c9..6c95c60c 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 @@ -46,6 +46,7 @@ public class DeviceVO extends Device implements IotDevice { private String picture; @ApiModelProperty("型号标签列表") + @JsonView(JsonViewProfile.App.class) private List modelTags; @ApiModelProperty("套餐列表") From 91fcd92952ce80e733e80525397aa93b6a11aa0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Sat, 8 Feb 2025 16:15:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/BusinessStatisticsQuery.java | 3 +++ .../dashboard/mapper/DashboardMapper.xml | 7 +++++++ .../staff/StaffDashboardController.java | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/BusinessStatisticsQuery.java b/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/BusinessStatisticsQuery.java index 42e89ea5..3cc1cf23 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/BusinessStatisticsQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/BusinessStatisticsQuery.java @@ -22,6 +22,9 @@ public class BusinessStatisticsQuery { @ApiModelProperty("商户ID") private Long mchId; + @ApiModelProperty("合伙人ID") + private Long staffId; + @ApiModelProperty("店铺ID") private Long storeId; diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/mapper/DashboardMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/dashboard/mapper/DashboardMapper.xml index cf6ea82f..f80355ce 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/dashboard/mapper/DashboardMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/mapper/DashboardMapper.xml @@ -29,6 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sm_device sd on sd.device_id = stb.device_id and stb.mch_id = #{mchId} + + and ss.store_id in ( + select distinct sss.store_id + from ss_store_staff sss + where sss.user_id = #{staffId} + ) + and stb.store_id is null and stb.store_id = #{storeId} diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/staff/StaffDashboardController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/staff/StaffDashboardController.java index d1884def..ad438127 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/staff/StaffDashboardController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/staff/StaffDashboardController.java @@ -1,8 +1,12 @@ package com.ruoyi.web.controller.staff; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.dashboard.domain.dto.BusinessStatisticsQuery; import com.ruoyi.dashboard.service.DashboardService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,4 +22,19 @@ public class StaffDashboardController extends BaseController { @Autowired DashboardService dashboardService; + @ApiOperation("合伙人获取店铺维度的订单统计") + @GetMapping("/businessStatisticsByStore") + public AjaxResult businessStatisticsByStore(BusinessStatisticsQuery query) { + query.setStaffId(getUserId()); + return success(dashboardService.businessStatisticsByStore(query)); + } + + @ApiOperation("合伙人获取指定店铺的订单统计") + @GetMapping("/businessStatisticsByDevice") + public AjaxResult businessStatisticsByDevice(BusinessStatisticsQuery query) { + query.setStaffId(getUserId()); + return success(dashboardService.businessStatisticsByDevice(query)); + } + + } From a88d5c407c86ad7a4201f84c910cc287aa1755e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Tue, 11 Feb 2025 10:29:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?debug:=E9=AB=98=E5=B9=B6=E5=8F=91=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=99=BA=E8=83=BD=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=88=E5=9B=A0=E4=B8=BA=E4=B9=90=E8=A7=82?= =?UTF-8?q?=E9=94=81=E4=BA=86=E4=BD=99=E9=A2=9D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/service/impl/IotServiceImpl.java | 4 +- .../ruoyi/ss/user/mapper/SmUserMapper.java | 39 +++++++++++-------- .../com/ruoyi/ss/user/mapper/SmUserMapper.xml | 31 +++++++++------ .../ss/user/service/impl/UserServiceImpl.java | 27 ++++++------- 4 files changed, 57 insertions(+), 44 deletions(-) diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java index bee68cbe..85647d6e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java @@ -100,10 +100,10 @@ public class IotServiceImpl implements IotService { if (res != null && res.isNotOnline()) { status = DeviceOnlineStatus.OFFLINE.getStatus(); } - // 若是命令超时，则累加redis数据，超过1次则判断为离线 + // 若是命令超时，则累加redis数据，超过2次则判断为离线 else if (res == null || res.isCmdTimeout()) { long offlineCount = redisCache.incrementCacheValue(incrementCacheKey, 60, TimeUnit.SECONDS); - if (offlineCount >= 1) { + if (offlineCount >= 2) { status = DeviceOnlineStatus.OFFLINE.getStatus(); } else { status = DeviceOnlineStatus.ONLINE.getStatus(); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java index 7e9d5f51..51bfb765 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java @@ -1,12 +1,13 @@ package com.ruoyi.ss.user.mapper; +import java.math.BigDecimal; +import java.util.List; + +import org.apache.ibatis.annotations.Param; + import com.ruoyi.common.core.domain.entity.SmUser; import com.ruoyi.ss.user.domain.SmUserQuery; import com.ruoyi.ss.user.domain.SmUserVO; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.List; /** * 普通用户信息Mapper接口 @@ -66,16 +67,6 @@ public interface SmUserMapper int selectCount(SmUserQuery dto); - /** - * 增加余额 - * @param userId 用户id - * @param amount 金额 - * @param beforeBalance 变动前的余额（并发） - */ - int addBalance(@Param("userId") Long userId, - @Param("amount") BigDecimal amount, - @Param("beforeBalance") BigDecimal beforeBalance - ); SmUserVO selectSmUserByWxOpenId(String openId); @@ -106,12 +97,19 @@ public interface SmUserMapper * @param userId 用户id * @param amount 金额 * @param check 校验余额是否充足 - * @param beforeBalance 变动前的余额（并发） */ int subtractBalance(@Param("userId") Long userId, @Param("amount") BigDecimal amount, - @Param("check") boolean check, - @Param("beforeBalance") BigDecimal beforeBalance + @Param("check") boolean check + ); + + /** + * 增加余额 + * @param userId 用户id + * @param amount 金额 + */ + int addBalance(@Param("userId") Long userId, + @Param("amount") BigDecimal amount ); /** @@ -146,4 +144,11 @@ public interface SmUserMapper * 解除实名认证 */ int resetRealName(Long userId); + + /** + * 查询用户余额 + */ + BigDecimal selectBalanceForUpdate(@Param("userId") Long userId); + + } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml index eba26fdf..62fb80ce 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml @@ -286,12 +286,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} and del_flag = '0' - - update sm_user - set balance = balance + #{amount} - where user_id = #{userId} and del_flag = '0' and balance = #{beforeBalance} - - update sm_user @@ -362,13 +356,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sm_user set balance = balance - #{amount} - - user_id = #{userId} and del_flag = '0' and balance = #{beforeBalance} - - and balance >= #{amount} - + where user_id = #{userId} and del_flag = '0' + + and balance >= #{amount} + + - + + update sm_user + set balance = balance + #{amount} + where user_id = #{userId} and del_flag = '0' @@ -426,4 +423,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sm_user su where su.phonenumber = #{phonenumber} and su.del_flag != '2' + + + + + diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java index c19e4273..49d5513b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserServiceImpl.java @@ -231,19 +231,19 @@ public class UserServiceImpl implements UserService if (BigDecimal.ZERO.compareTo(amount) == 0) { return 1; } - - // 查询用户 - SmUserVO user = selectSmUserByUserId(userId); + // 查询用户余额 + BigDecimal balance = smUserMapper.selectBalanceForUpdate(userId); + ServiceUtil.assertion(balance == null, "增加ID为%s的用户余额%s元失败，请重试", userId, amount); // 修改余额 - int updateCount = smUserMapper.addBalance(userId, amount, user.getBalance()); - ServiceUtil.assertion(updateCount != 1, "增加用户余额失败，请重试"); + int update = smUserMapper.addBalance(userId, amount); + ServiceUtil.assertion(update != 1, "增加用户余额失败，请重试"); // 余额变动记录 - int record = recordBalanceService.record(userId, user.getBalance(), amount, reason, bstType, bstId); + int record = recordBalanceService.record(userId, balance, amount, reason, bstType, bstId); ServiceUtil.assertion(record != 1, "用户余额变动记录失败"); - return updateCount; + return update; } @Override @@ -259,18 +259,19 @@ public class UserServiceImpl implements UserService return 1; } - // 查询用户 - SmUserVO user = selectSmUserByUserId(userId); + // 查询用户余额 + BigDecimal balance = smUserMapper.selectBalanceForUpdate(userId); + ServiceUtil.assertion(balance == null || balance.compareTo(amount) < 0, "减少ID为%s的用户余额%s元失败，请重试", userId, amount); // 更新用户余额 - int updateCount = smUserMapper.subtractBalance(userId, amount, check, user.getBalance()); - ServiceUtil.assertion(updateCount != 1, "减少ID为%s的用户余额%s元失败，请重试", userId, amount); + int update = smUserMapper.subtractBalance(userId, amount, check); + ServiceUtil.assertion(update != 1, "减少ID为%s的用户余额%s元失败，请重试", userId, amount); // 余额变动记录 - int record = recordBalanceService.record(userId, user.getBalance(), amount.negate(), reason, bstType, bstId); + int record = recordBalanceService.record(userId, balance, amount.negate(), reason, bstType, bstId); ServiceUtil.assertion(record != 1, "记录ID为%s的用户余额变动记录%s元失败", userId, amount); - return updateCount; + return update; } From 2c64d6d72cc5ec1a090bc65d759b48ab31ae83e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Wed, 12 Feb 2025 10:33:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/core/redis/RedisCache.java | 4 +- .../com/ruoyi/common/utils/MathUtils.java | 5 + .../iot/service/impl/IotServiceImpl.java | 117 +++++++++++------- .../ruoyi/ss/device/mapper/DeviceMapper.java | 5 + .../ruoyi/ss/device/mapper/DeviceMapper.xml | 15 +++ .../ss/device/service/DeviceService.java | 5 + .../service/impl/DeviceServiceImpl.java | 8 ++ 7 files changed, 114 insertions(+), 45 deletions(-) diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java index fc2440b8..de588d96 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java @@ -273,7 +273,7 @@ public class RedisCache * @param timeUnit 时间单位 * @return 累计后的值 */ - public long incrementCacheValue(final String key, final long timeout, final TimeUnit timeUnit) { + public Long incrementCacheValue(final String key, final long timeout, final TimeUnit timeUnit) { // 使用 SET 命令的 NX 和 EX 选项确保初始值设置和过期时间设置是原子性的 Boolean isNewKey = redisTemplate.opsForValue().setIfAbsent(key, 0, timeout, timeUnit); if (isNewKey != null && isNewKey) { @@ -281,7 +281,7 @@ public class RedisCache return 1L; } // 使用 INCR 命令累计值 - long newValue = redisTemplate.opsForValue().increment(key); + Long newValue = redisTemplate.opsForValue().increment(key); // 刷新过期时间 redisTemplate.expire(key, timeout, timeUnit); return newValue; diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/MathUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/MathUtils.java index 54947c56..73d69d16 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/MathUtils.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/MathUtils.java @@ -41,4 +41,9 @@ public class MathUtils { } return result; } + + // 把Integer转为Long类型 + public static Long IntegerToLong(Integer num) { + return num == null ? null : Long.valueOf(num); + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java index 85647d6e..00b3f681 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java @@ -1,5 +1,18 @@ package com.ruoyi.iot.service.impl; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.constant.CacheConstants; @@ -10,33 +23,32 @@ 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.exception.ServiceException; +import com.ruoyi.common.utils.MathUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.oneNet.Token; -import com.ruoyi.iot.domain.*; -import com.ruoyi.iot.domain.response.*; +import com.ruoyi.iot.domain.CreateDeviceVo; +import com.ruoyi.iot.domain.CurrentDeviceData; +import com.ruoyi.iot.domain.HistoryDeviceData; +import com.ruoyi.iot.domain.IotDeviceDetail; +import com.ruoyi.iot.domain.IotDeviceInfo; +import com.ruoyi.iot.domain.response.CommandResponse; +import com.ruoyi.iot.domain.response.CurrentDataPointResponse; +import com.ruoyi.iot.domain.response.DetailResponse; +import com.ruoyi.iot.domain.response.HistoryDataPointResponse; +import com.ruoyi.iot.domain.response.ListResponse; import com.ruoyi.iot.enums.IotHttpStatus; import com.ruoyi.iot.interfaces.IotDevice; import com.ruoyi.iot.service.IotConverter; import com.ruoyi.iot.service.IotService; import com.ruoyi.ss.commandLog.service.ICommandLogService; import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; +import com.ruoyi.ss.device.service.DeviceService; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; /** * @author wjh @@ -75,6 +87,12 @@ public class IotServiceImpl implements IotService { @Autowired private RedisLock redisLock; + @Autowired + private DeviceService deviceService; + + @Autowired + private ScheduledExecutorService scheduledExecutorService; + // 查询OneNet设备在线状态 @Override public String getOnlineStatus(String deviceName, String productId, String type) { @@ -88,35 +106,12 @@ public class IotServiceImpl implements IotService { if (lock) { // log.info("进入lock"); // 从缓存获取上次的在线状态，若不存在，则发命令，防止短时间发送命令过于频繁 - String cacheKey = CacheConstants.DEVICE_ONLINE_STATUS + deviceName; - String incrementCacheKey = CacheConstants.DEVICE_OFFLINE_INCREMENT + deviceName; + String cacheKey = this.getOnlineCacheKey(deviceName); String status = redisCache.getCacheObject(cacheKey); if (StringUtils.isBlank(status)) { -// log.info("进入command"); // 发送命令 CommandResponse res = uploadData(deviceName, productId, "获取在线状态"); - - // 若是离线，则直接返回离线 - if (res != null && res.isNotOnline()) { - status = DeviceOnlineStatus.OFFLINE.getStatus(); - } - // 若是命令超时，则累加redis数据，超过2次则判断为离线 - else if (res == null || res.isCmdTimeout()) { - long offlineCount = redisCache.incrementCacheValue(incrementCacheKey, 60, TimeUnit.SECONDS); - if (offlineCount >= 2) { - status = DeviceOnlineStatus.OFFLINE.getStatus(); - } else { - status = DeviceOnlineStatus.ONLINE.getStatus(); - } - } - // 若命令发送成功，则清空redis累加数据 - else if (res.isSuccess()) { - status = DeviceOnlineStatus.ONLINE.getStatus(); - redisCache.deleteObject(incrementCacheKey); - } - - // 缓存结果30秒 - redisCache.setCacheObject(cacheKey, status, 30, TimeUnit.SECONDS); + status = this.parseToOnlineStatus(res, deviceName, false); } return status; @@ -137,6 +132,31 @@ public class IotServiceImpl implements IotService { } } + private String parseToOnlineStatus(CommandResponse res, String deviceName, boolean increment) { + String incrementCacheKey = CacheConstants.DEVICE_OFFLINE_INCREMENT + deviceName; + // 若命令发送成功，则清空redis累加数据 + if (res != null && res.isSuccess()) { + redisCache.deleteObject(incrementCacheKey); + return DeviceOnlineStatus.ONLINE.getStatus(); + } + // 若是离线，则直接返回离线 + if (res != null && res.isNotOnline()) { + return DeviceOnlineStatus.OFFLINE.getStatus(); + } + // 若是命令超时或者其他情况，则累加redis数据，超过2次则判断为离线 + else { + Long offlineCount = MathUtils.IntegerToLong(redisCache.getCacheObject(incrementCacheKey)); + if (increment) { + offlineCount = redisCache.incrementCacheValue(incrementCacheKey, 60, TimeUnit.SECONDS); + } + if (offlineCount != null && offlineCount >= 2) { + return DeviceOnlineStatus.OFFLINE.getStatus(); + } else { + return DeviceOnlineStatus.ONLINE.getStatus(); + } + } + } + @Override public String getOnlineStatus(IotDevice device) { String status = DeviceOnlineStatus.OFFLINE.getStatus(); @@ -552,10 +572,17 @@ public class IotServiceImpl implements IotService { // 记录成功日志 this.addCommandLog(deviceName, command, res.getMsg(), reason, res.getCode()); - // 若返回数据为离线或者超时，则判断设备是否在线 -// if (IotHttpStatus.checkOnlineList().contains(res.getCode())) { -// deviceService.checkOnlineByCommandLogSync(deviceName); -// } + // 转为在线状态，并缓存结果30秒 + String status = this.parseToOnlineStatus(res, deviceName, true); + redisCache.setCacheObject(this.getOnlineCacheKey(deviceName), status, 30, TimeUnit.SECONDS); + // 异步更新设备在线状态 + scheduledExecutorService.schedule(() -> { + int update = deviceService.updateOnlineStatusByMac(deviceName, status); + if (update != 1) { + log.error("异步更新设备在线状态失败,MAC={},status={}", deviceName, status); + } + },0, TimeUnit.SECONDS); + return res; } catch (Exception e) { this.addCommandLog(deviceName, command, "操作失败：" + e.getMessage(), reason, null); @@ -563,6 +590,10 @@ public class IotServiceImpl implements IotService { } } + private String getOnlineCacheKey(String deviceName) { + return CacheConstants.DEVICE_ONLINE_STATUS + deviceName; + } + // 异步添加日志 private void addCommandLog(String deviceName, String command, String result, String reason, Integer iotCode) { LoginUser loginUser = null; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java index b3e32d69..5a7e1077 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java @@ -227,4 +227,9 @@ public interface DeviceMapper * 查询ID列表 */ List selectIds(@Param("query") DeviceQuery query); + + /** + * 更新在线状态 + */ + int updateOnlineStatusByMac(@Param("mac") String mac, @Param("status") String status); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml index 0f7736dd..dc90f94a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml @@ -726,6 +726,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where device_id = #{deviceId} + + update sm_device + set online_status1 = if (#{mac} = mac, #{status}, online_status1), + online_status2 = if (#{mac} = mac2, #{status}, online_status2), + online_status = if (#{mac} = mac, + if (#{status} = '1' or online_status2 = '1', '1', '0'), + if (#{status} = '1' or online_status1 = '1', '1', '0') + ), + last_online_time = if (#{mac} = mac, + if (#{status} = '1' or online_status2 = '1', now(), last_online_time), + if (#{status} = '1' or online_status1 = '1', now(), last_online_time) + ) + where mac = #{mac} or mac2 = #{mac} + + delete from sm_device where device_id = #{deviceId} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java index 05d280d6..28ce383b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java @@ -436,4 +436,9 @@ public interface DeviceService * 查询商户设备列表 */ List selectByMchId(Long userId); + + /** + * 根据mac修改在线状态 + */ + int updateOnlineStatusByMac(String mac, String status); } 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 27480b2a..d4f91863 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 @@ -1442,6 +1442,14 @@ public class DeviceServiceImpl implements DeviceService return selectSmDeviceList(query); } + @Override + public int updateOnlineStatusByMac(String mac, String status) { + if (StringUtils.isAnyBlank(mac, status)) { + return 0; + } + return deviceMapper.updateOnlineStatusByMac(mac, status); + } + private List selectIds(DeviceQuery query) { return deviceMapper.selectIds(query); }