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

卡座前端功能

Browse Source
This commit is contained in:
SjS 2025-05-20 18:35:26 +08:00
parent 233d0ccaef
commit af992b181b
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
View File

@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.userId != null "> and bb.user_id = #{query.userId}</if> <if test="query.userId != null "> and bb.user_id = #{query.userId}</if>
<if test="query.deleted != null "> and bb.deleted = #{query.deleted}</if> <if test="query.deleted != null "> and bb.deleted = #{query.deleted}</if>
<if test="query.boothId != null "> and bb.booth_id = #{query.boothId}</if> <if test="query.boothId != null "> and bb.booth_id = #{query.boothId}</if>
<if test="query.storeId != null "> and bs.store_id = #{query.storeId}</if>
<if test="query.boothName != null and query.boothName != ''"> and bb.booth_name like concat('%', #{query.boothName}, '%')</if> <if test="query.boothName != null and query.boothName != ''"> and bb.booth_name like concat('%', #{query.boothName}, '%')</if>
<if test="query.picture != null and query.picture != ''"> and bb.picture = #{query.picture}</if> <if test="query.picture != null and query.picture != ''"> and bb.picture = #{query.picture}</if>
<if test="query.partName != null and query.partName != ''"> and bp.part_name like concat('%', #{query.partName}, '%') </if> <if test="query.partName != null and query.partName != ''"> and bp.part_name like concat('%', #{query.partName}, '%') </if>

3
ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java
View File

@ -267,7 +267,6 @@ public class BoothServiceImpl implements BoothService {
// 操作校验 // 操作校验
ServiceUtil.assertion(booth.getStoreId() == null, "当前卡座未绑定店铺"); ServiceUtil.assertion(booth.getStoreId() == null, "当前卡座未绑定店铺");
ServiceUtil.assertion(booth.getExpiredTime().isBefore(LocalDateTime.now()), "请重新绑定卡座");
// 判断当前用户是否在该店铺下有余额 // 判断当前用户是否在该店铺下有余额
LightingNumVO vo = lightingNumMapper.selectLightingNumByUserId(userId, booth.getStoreId()); LightingNumVO vo = lightingNumMapper.selectLightingNumByUserId(userId, booth.getStoreId());
@ -340,7 +339,7 @@ public class BoothServiceImpl implements BoothService {
ServiceUtil.assertion(res == null, "设备爆灯失败：未知错误"); ServiceUtil.assertion(res == null, "设备爆灯失败：未知错误");
return IotUtil.isSuccess(res); return IotUtil.isSuccess(res);
} else { } else {
ServiceUtil.assertion(true, "爆灯频繁,请稍等后再进行爆灯"); ServiceUtil.assertion(true, "当前设备正在爆灯,请等待爆灯结束后再进行操作");
} }
return false; return false;
} }

6
ruoyi-web/src/main/java/com/ruoyi/web/app/AppBoothController.java
View File

@ -41,12 +41,6 @@ public class AppBoothController extends BaseController {
if (booth == null) { if (booth == null) {
return error("当前卡座信息不存在"); return error("当前卡座信息不存在");
} }
if (booth.getUserId()==null) {
return error("您无权操作当前卡座设备");
}
if (!booth.getUserId().equals(getUserId())){
return error("您无权操作当前卡座设备");
}
return success(boothService.lighting(booth,getUserId(),requiredIot)); return success(boothService.lighting(booth,getUserId(),requiredIot));
} }